Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1081)

Side by Side Diff: content/content_tests.gypi

Issue 14772009: Rationalize dependency on khronos EGL headers in place of angle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated khronos headers. Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/content_gpu.gypi ('k') | gpu/command_buffer_service.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 'type': 'executable', 958 'type': 'executable',
959 'dependencies': [ 959 'dependencies': [
960 'content', 960 'content',
961 '../base/base.gyp:base', 961 '../base/base.gyp:base',
962 '../testing/gtest.gyp:gtest', 962 '../testing/gtest.gyp:gtest',
963 '../media/media.gyp:media', 963 '../media/media.gyp:media',
964 '../ui/gl/gl.gyp:gl', 964 '../ui/gl/gl.gyp:gl',
965 '../ui/ui.gyp:ui', 965 '../ui/ui.gyp:ui',
966 ], 966 ],
967 'include_dirs': [ 967 'include_dirs': [
968 '<(DEPTH)/third_party/angle/include', 968 '<(DEPTH)/third_party/khronos',
969 ], 969 ],
970 'sources': [ 970 'sources': [
971 'common/gpu/media/rendering_helper.h', 971 'common/gpu/media/rendering_helper.h',
972 'common/gpu/media/rendering_helper_gl.cc', 972 'common/gpu/media/rendering_helper_gl.cc',
973 'common/gpu/media/video_decode_accelerator_unittest.cc', 973 'common/gpu/media/video_decode_accelerator_unittest.cc',
974 ], 974 ],
975 'conditions': [ 975 'conditions': [
976 ['target_arch=="arm"', { 976 ['target_arch=="arm"', {
977 'include_dirs': [ 977 'include_dirs': [
978 '<(DEPTH)/third_party/openmax/il', 978 '<(DEPTH)/third_party/openmax/il',
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 'resource_dir': 'shell/android/shell_apk/res', 1102 'resource_dir': 'shell/android/shell_apk/res',
1103 'additional_src_dirs': ['public/android/javatests/',], 1103 'additional_src_dirs': ['public/android/javatests/',],
1104 'is_test_apk': 1, 1104 'is_test_apk': 1,
1105 }, 1105 },
1106 'includes': [ '../build/java_apk.gypi' ], 1106 'includes': [ '../build/java_apk.gypi' ],
1107 }, 1107 },
1108 ], 1108 ],
1109 }], 1109 }],
1110 ], 1110 ],
1111 } 1111 }
OLDNEW
« no previous file with comments | « content/content_gpu.gypi ('k') | gpu/command_buffer_service.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698