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

Side by Side Diff: content/content_tests.gypi

Issue 614053003: Replace build_angle.gyp with angle.gyp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« 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) 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 'variables': { 6 'variables': {
7 'layouttest_support_content_sources': [ 7 'layouttest_support_content_sources': [
8 'public/test/layouttest_support.h', 8 'public/test/layouttest_support.h',
9 'public/test/nested_message_pump_android.cc', 9 'public/test/nested_message_pump_android.cc',
10 'public/test/nested_message_pump_android.h', 10 'public/test/nested_message_pump_android.h',
(...skipping 1473 matching lines...) Expand 10 before | Expand all | Expand 10 after
1484 '../testing/android/native_test.gyp:native_test_native_code', 1484 '../testing/android/native_test.gyp:native_test_native_code',
1485 '../gpu/gpu.gyp:gpu_unittest_utils', 1485 '../gpu/gpu.gyp:gpu_unittest_utils',
1486 ], 1486 ],
1487 }, { # OS!="android" 1487 }, { # OS!="android"
1488 'sources/': [ 1488 'sources/': [
1489 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'], 1489 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'],
1490 ], 1490 ],
1491 }], 1491 }],
1492 ['OS=="win"', { 1492 ['OS=="win"', {
1493 'dependencies': [ 1493 'dependencies': [
1494 '<(angle_path)/src/build_angle.gyp:libEGL', 1494 '<(angle_path)/src/angle.gyp:libEGL',
1495 '<(angle_path)/src/build_angle.gyp:libGLESv2', 1495 '<(angle_path)/src/angle.gyp:libGLESv2',
1496 ], 1496 ],
1497 }], 1497 }],
1498 ['(OS=="win" and win_use_allocator_shim==1) or ' 1498 ['(OS=="win" and win_use_allocator_shim==1) or '
1499 '(os_posix == 1 and OS != "android" and ' 1499 '(os_posix == 1 and OS != "android" and '
1500 ' use_allocator!="none")', { 1500 ' use_allocator!="none")', {
1501 'dependencies': [ 1501 'dependencies': [
1502 '../base/allocator/allocator.gyp:allocator', 1502 '../base/allocator/allocator.gyp:allocator',
1503 ], 1503 ],
1504 }], 1504 }],
1505 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', { 1505 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
1918 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1918 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1919 }, 1919 },
1920 ], 1920 ],
1921 }], 1921 }],
1922 ], 1922 ],
1923 }, 1923 },
1924 ], 1924 ],
1925 }], 1925 }],
1926 ], 1926 ],
1927 } 1927 }
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