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

Side by Side Diff: content/content_tests.gypi

Issue 106623003: Update dependencies to use new angle repository. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years 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
« no previous file with comments | « content/content_gpu.gypi ('k') | gpu/DEPS » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'dependencies': [ 10 'dependencies': [
(...skipping 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after
1255 '../testing/android/native_test.gyp:native_test_native_code', 1255 '../testing/android/native_test.gyp:native_test_native_code',
1256 '../gpu/gpu.gyp:gpu_unittest_utils', 1256 '../gpu/gpu.gyp:gpu_unittest_utils',
1257 ], 1257 ],
1258 }, { # OS!="android" 1258 }, { # OS!="android"
1259 'sources/': [ 1259 'sources/': [
1260 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'], 1260 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'],
1261 ], 1261 ],
1262 }], 1262 }],
1263 ['OS=="win"', { 1263 ['OS=="win"', {
1264 'dependencies': [ 1264 'dependencies': [
1265 '../third_party/angle_dx11/src/build_angle.gyp:libEGL', 1265 '<(angle_path)/src/build_angle.gyp:libEGL',
1266 '../third_party/angle_dx11/src/build_angle.gyp:libGLESv2', 1266 '<(angle_path)/src/build_angle.gyp:libGLESv2',
1267 ], 1267 ],
1268 }], 1268 }],
1269 ['(OS=="win" and win_use_allocator_shim==1) or ' 1269 ['(OS=="win" and win_use_allocator_shim==1) or '
1270 '(os_posix == 1 and OS != "android" and ' 1270 '(os_posix == 1 and OS != "android" and '
1271 ' linux_use_tcmalloc==1)', { 1271 ' linux_use_tcmalloc==1)', {
1272 'dependencies': [ 1272 'dependencies': [
1273 '../base/allocator/allocator.gyp:allocator', 1273 '../base/allocator/allocator.gyp:allocator',
1274 ], 1274 ],
1275 }], 1275 }],
1276 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', { 1276 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
1644 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1644 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1645 }, 1645 },
1646 ], 1646 ],
1647 }], 1647 }],
1648 ], 1648 ],
1649 }, 1649 },
1650 ], 1650 ],
1651 }], 1651 }],
1652 ], 1652 ],
1653 } 1653 }
OLDNEW
« no previous file with comments | « content/content_gpu.gypi ('k') | gpu/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698