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

Side by Side Diff: content/content_tests.gypi

Issue 1323333002: Copy libvpx from DEPS to src (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update include order and rebase Created 5 years, 3 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 967 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 978 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
979 ], 979 ],
980 }], 980 }],
981 ['OS!="android" and OS!="ios"', { 981 ['OS!="android" and OS!="ios"', {
982 'sources': [ 982 'sources': [
983 'browser/compositor/test/no_transport_image_transport_factory.cc', 983 'browser/compositor/test/no_transport_image_transport_factory.cc',
984 'browser/compositor/test/no_transport_image_transport_factory.h', 984 'browser/compositor/test/no_transport_image_transport_factory.h',
985 ], 985 ],
986 'dependencies': [ 986 'dependencies': [
987 '../ui/compositor/compositor.gyp:compositor', 987 '../ui/compositor/compositor.gyp:compositor',
988 '../third_party/libvpx/libvpx.gyp:libvpx', 988 '../third_party/libvpx_new/libvpx.gyp:libvpx_new',
989 ], 989 ],
990 }], 990 }],
991 ['OS=="android"', { 991 ['OS=="android"', {
992 'dependencies': [ 992 'dependencies': [
993 '../ui/android/ui_android.gyp:ui_android', 993 '../ui/android/ui_android.gyp:ui_android',
994 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', 994 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
995 'content.gyp:content_v8_external_data', 995 'content.gyp:content_v8_external_data',
996 ], 996 ],
997 }], 997 }],
998 ['v8_use_external_startup_data==1 and OS!="ios"', { 998 ['v8_use_external_startup_data==1 and OS!="ios"', {
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
1182 ], 1182 ],
1183 'dependencies': [ 1183 'dependencies': [
1184 '../testing/android/native_test.gyp:native_test_native_code', 1184 '../testing/android/native_test.gyp:native_test_native_code',
1185 ], 1185 ],
1186 'dependencies!': [ 1186 'dependencies!': [
1187 '../device/battery/battery.gyp:device_battery', 1187 '../device/battery/battery.gyp:device_battery',
1188 ], 1188 ],
1189 }], 1189 }],
1190 ['OS != "android" and OS != "ios"', { 1190 ['OS != "android" and OS != "ios"', {
1191 'dependencies': [ 1191 'dependencies': [
1192 '../third_party/libvpx/libvpx.gyp:libvpx', 1192 '../third_party/libvpx_new/libvpx.gyp:libvpx_new',
1193 ], 1193 ],
1194 }], 1194 }],
1195 ['use_aura!=1 and OS!="android"', { 1195 ['use_aura!=1 and OS!="android"', {
1196 'sources!': [ 1196 'sources!': [
1197 'browser/renderer_host/input/tap_suppression_controller_unittest.cc' , 1197 'browser/renderer_host/input/tap_suppression_controller_unittest.cc' ,
1198 ], 1198 ],
1199 }], 1199 }],
1200 ['use_dbus==0', { 1200 ['use_dbus==0', {
1201 'sources!': [ 1201 'sources!': [
1202 'browser/geolocation/wifi_data_provider_linux_unittest.cc', 1202 'browser/geolocation/wifi_data_provider_linux_unittest.cc',
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after
2142 ], 2142 ],
2143 }, 2143 },
2144 'includes': [ 2144 'includes': [
2145 '../build/host_jar.gypi', 2145 '../build/host_jar.gypi',
2146 ], 2146 ],
2147 }, 2147 },
2148 ], 2148 ],
2149 }], 2149 }],
2150 ], 2150 ],
2151 } 2151 }
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