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

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: keep checklicenses exception for old directory, add exe bit to run_perl.py 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
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 965 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 976 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
977 ], 977 ],
978 }], 978 }],
979 ['OS!="android" and OS!="ios"', { 979 ['OS!="android" and OS!="ios"', {
980 'sources': [ 980 'sources': [
981 'browser/compositor/test/no_transport_image_transport_factory.cc', 981 'browser/compositor/test/no_transport_image_transport_factory.cc',
982 'browser/compositor/test/no_transport_image_transport_factory.h', 982 'browser/compositor/test/no_transport_image_transport_factory.h',
983 ], 983 ],
984 'dependencies': [ 984 'dependencies': [
985 '../ui/compositor/compositor.gyp:compositor', 985 '../ui/compositor/compositor.gyp:compositor',
986 '../third_party/libvpx/libvpx.gyp:libvpx', 986 '../third_party/libvpx_new/libvpx.gyp:libvpx_new',
987 ], 987 ],
988 }], 988 }],
989 ['OS=="android"', { 989 ['OS=="android"', {
990 'dependencies': [ 990 'dependencies': [
991 '../ui/android/ui_android.gyp:ui_android', 991 '../ui/android/ui_android.gyp:ui_android',
992 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', 992 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
993 'content.gyp:content_v8_external_data', 993 'content.gyp:content_v8_external_data',
994 ], 994 ],
995 }], 995 }],
996 ['v8_use_external_startup_data==1 and OS!="ios"', { 996 ['v8_use_external_startup_data==1 and OS!="ios"', {
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
1180 ], 1180 ],
1181 'dependencies': [ 1181 'dependencies': [
1182 '../testing/android/native_test.gyp:native_test_native_code', 1182 '../testing/android/native_test.gyp:native_test_native_code',
1183 ], 1183 ],
1184 'dependencies!': [ 1184 'dependencies!': [
1185 '../device/battery/battery.gyp:device_battery', 1185 '../device/battery/battery.gyp:device_battery',
1186 ], 1186 ],
1187 }], 1187 }],
1188 ['OS != "android" and OS != "ios"', { 1188 ['OS != "android" and OS != "ios"', {
1189 'dependencies': [ 1189 'dependencies': [
1190 '../third_party/libvpx/libvpx.gyp:libvpx', 1190 '../third_party/libvpx_new/libvpx.gyp:libvpx_new',
1191 ], 1191 ],
1192 }], 1192 }],
1193 ['use_aura!=1 and OS!="android"', { 1193 ['use_aura!=1 and OS!="android"', {
1194 'sources!': [ 1194 'sources!': [
1195 'browser/renderer_host/input/tap_suppression_controller_unittest.cc' , 1195 'browser/renderer_host/input/tap_suppression_controller_unittest.cc' ,
1196 ], 1196 ],
1197 }], 1197 }],
1198 ['use_dbus==0', { 1198 ['use_dbus==0', {
1199 'sources!': [ 1199 'sources!': [
1200 'browser/geolocation/wifi_data_provider_linux_unittest.cc', 1200 'browser/geolocation/wifi_data_provider_linux_unittest.cc',
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after
2140 ], 2140 ],
2141 }, 2141 },
2142 'includes': [ 2142 'includes': [
2143 '../build/host_jar.gypi', 2143 '../build/host_jar.gypi',
2144 ], 2144 ],
2145 }, 2145 },
2146 ], 2146 ],
2147 }], 2147 }],
2148 ], 2148 ],
2149 } 2149 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698