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

Side by Side Diff: content/content_tests.gypi

Issue 1734613003: Move libvpx_new to libvpx (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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 | « build/sanitizers/tsan_suppressions.cc ('k') | content/renderer/BUILD.gn » ('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 991 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 1002 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
1003 ], 1003 ],
1004 }], 1004 }],
1005 ['use_aura==1 or OS=="mac"', { 1005 ['use_aura==1 or OS=="mac"', {
1006 'sources': [ 1006 'sources': [
1007 'browser/compositor/test/no_transport_image_transport_factory.cc', 1007 'browser/compositor/test/no_transport_image_transport_factory.cc',
1008 'browser/compositor/test/no_transport_image_transport_factory.h', 1008 'browser/compositor/test/no_transport_image_transport_factory.h',
1009 ], 1009 ],
1010 'dependencies': [ 1010 'dependencies': [
1011 '../ui/compositor/compositor.gyp:compositor', 1011 '../ui/compositor/compositor.gyp:compositor',
1012 '../third_party/libvpx_new/libvpx.gyp:libvpx_new', 1012 '../third_party/libvpx/libvpx.gyp:libvpx',
1013 ], 1013 ],
1014 }], 1014 }],
1015 ['OS=="android"', { 1015 ['OS=="android"', {
1016 'dependencies': [ 1016 'dependencies': [
1017 '../ui/android/ui_android.gyp:ui_android', 1017 '../ui/android/ui_android.gyp:ui_android',
1018 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', 1018 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
1019 'content.gyp:content_shell_assets_copy', 1019 'content.gyp:content_shell_assets_copy',
1020 ], 1020 ],
1021 }], 1021 }],
1022 ['v8_use_external_startup_data==1 and OS!="ios"', { 1022 ['v8_use_external_startup_data==1 and OS!="ios"', {
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
1293 'renderer/media/video_track_recorder_unittest.cc', 1293 'renderer/media/video_track_recorder_unittest.cc',
1294 ], 1294 ],
1295 'dependencies': [ 1295 'dependencies': [
1296 '../testing/android/native_test.gyp:native_test_native_code', 1296 '../testing/android/native_test.gyp:native_test_native_code',
1297 ], 1297 ],
1298 'dependencies!': [ 1298 'dependencies!': [
1299 '../device/battery/battery.gyp:device_battery', 1299 '../device/battery/battery.gyp:device_battery',
1300 ], 1300 ],
1301 }, { # OS != "android" 1301 }, { # OS != "android"
1302 'dependencies': [ 1302 'dependencies': [
1303 '../third_party/libvpx_new/libvpx.gyp:libvpx_new', 1303 '../third_party/libvpx/libvpx.gyp:libvpx',
1304 ], 1304 ],
1305 }], 1305 }],
1306 ['chromecast == 1', { 1306 ['chromecast == 1', {
1307 'sources!': [ 1307 'sources!': [
1308 'renderer/media/audio_track_recorder_unittest.cc', 1308 'renderer/media/audio_track_recorder_unittest.cc',
1309 'renderer/media/media_recorder_handler_unittest.cc', 1309 'renderer/media/media_recorder_handler_unittest.cc',
1310 'renderer/media/video_track_recorder_unittest.cc', 1310 'renderer/media/video_track_recorder_unittest.cc',
1311 ], 1311 ],
1312 }], 1312 }],
1313 # Avoid windows due to non-availability of cursor resources in test. 1313 # Avoid windows due to non-availability of cursor resources in test.
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after
2245 'content_unittests_apk.isolate', 2245 'content_unittests_apk.isolate',
2246 ], 2246 ],
2247 }, 2247 },
2248 ], 2248 ],
2249 }, 2249 },
2250 ], 2250 ],
2251 ], 2251 ],
2252 }], 2252 }],
2253 ], 2253 ],
2254 } 2254 }
OLDNEW
« no previous file with comments | « build/sanitizers/tsan_suppressions.cc ('k') | content/renderer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698