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

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
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 1237 matching lines...) Expand 10 before | Expand all | Expand 10 after
1248 '../testing/android/native_test.gyp:native_test_native_code', 1248 '../testing/android/native_test.gyp:native_test_native_code',
1249 '../gpu/gpu.gyp:gpu_unittest_utils', 1249 '../gpu/gpu.gyp:gpu_unittest_utils',
1250 ], 1250 ],
1251 }, { # OS!="android" 1251 }, { # OS!="android"
1252 'sources/': [ 1252 'sources/': [
1253 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'], 1253 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'],
1254 ], 1254 ],
1255 }], 1255 }],
1256 ['OS=="win"', { 1256 ['OS=="win"', {
1257 'dependencies': [ 1257 'dependencies': [
1258 '../third_party/angle_dx11/src/build_angle.gyp:libEGL', 1258 '../third_party/angle/src/build_angle.gyp:libEGL',
Zhenyao Mo 2013/12/09 20:18:34 use angle_path here.
1259 '../third_party/angle_dx11/src/build_angle.gyp:libGLESv2', 1259 '../third_party/angle/src/build_angle.gyp:libGLESv2',
1260 ], 1260 ],
1261 }], 1261 }],
1262 ['(OS=="win" and win_use_allocator_shim==1) or ' 1262 ['(OS=="win" and win_use_allocator_shim==1) or '
1263 '(os_posix == 1 and OS != "android" and ' 1263 '(os_posix == 1 and OS != "android" and '
1264 ' linux_use_tcmalloc==1)', { 1264 ' linux_use_tcmalloc==1)', {
1265 'dependencies': [ 1265 'dependencies': [
1266 '../base/allocator/allocator.gyp:allocator', 1266 '../base/allocator/allocator.gyp:allocator',
1267 ], 1267 ],
1268 }], 1268 }],
1269 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', { 1269 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
1637 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1637 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1638 }, 1638 },
1639 ], 1639 ],
1640 }], 1640 }],
1641 ], 1641 ],
1642 }, 1642 },
1643 ], 1643 ],
1644 }], 1644 }],
1645 ], 1645 ],
1646 } 1646 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698