| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
| 7 import("//build/config/crypto.gni") | 7 import("//build/config/crypto.gni") |
| 8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
| 9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
| 10 import("//chrome/chrome_tests.gni") | 10 import("//chrome/chrome_tests.gni") |
| (...skipping 1282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1293 if (enable_remoting) { | 1293 if (enable_remoting) { |
| 1294 sources += rebase_path( | 1294 sources += rebase_path( |
| 1295 chrome_tests_gypi_values.chrome_browser_tests_remoting_sources, | 1295 chrome_tests_gypi_values.chrome_browser_tests_remoting_sources, |
| 1296 ".", | 1296 ".", |
| 1297 "//chrome") | 1297 "//chrome") |
| 1298 #deps += [ "//remoting:remoting_webapp" ] TODO(GYP) | 1298 #deps += [ "//remoting:remoting_webapp" ] TODO(GYP) |
| 1299 } | 1299 } |
| 1300 if (use_x11) { | 1300 if (use_x11) { |
| 1301 deps += [ "//tools/xdisplaycheck" ] | 1301 deps += [ "//tools/xdisplaycheck" ] |
| 1302 } | 1302 } |
| 1303 |
| 1304 if (use_aura) { |
| 1305 sources += [ |
| 1306 "base/mash_browser_tests_main.cc", |
| 1307 "base/mash_browser_tests_main.h", |
| 1308 "base/mojo_test_connector.cc", |
| 1309 "base/mojo_test_connector.h", |
| 1310 ] |
| 1311 |
| 1312 deps += [ |
| 1313 "//mojo/shell/background:lib", |
| 1314 "//mojo/shell/background/tests:test_support", |
| 1315 ] |
| 1316 |
| 1317 data_deps += [ "//mash/session" ] |
| 1318 |
| 1319 defines += [ "MOJO_SHELL_CLIENT" ] |
| 1320 } |
| 1303 } | 1321 } |
| 1304 | 1322 |
| 1305 test("sync_integration_tests") { | 1323 test("sync_integration_tests") { |
| 1306 sources = | 1324 sources = |
| 1307 rebase_path(chrome_tests_gypi_values.sync_integration_tests_sources, | 1325 rebase_path(chrome_tests_gypi_values.sync_integration_tests_sources, |
| 1308 ".", | 1326 ".", |
| 1309 "//chrome") | 1327 "//chrome") |
| 1310 | 1328 |
| 1311 data = [ | 1329 data = [ |
| 1312 "//chrome/test/data/sync/", | 1330 "//chrome/test/data/sync/", |
| (...skipping 922 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2235 if (is_android) { | 2253 if (is_android) { |
| 2236 android_library("unit_tests_java") { | 2254 android_library("unit_tests_java") { |
| 2237 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" | 2255 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" |
| 2238 deps = [ | 2256 deps = [ |
| 2239 "//base:base_java", | 2257 "//base:base_java", |
| 2240 "//chrome/android:chrome_java", | 2258 "//chrome/android:chrome_java", |
| 2241 "//content/public/android:content_java", | 2259 "//content/public/android:content_java", |
| 2242 ] | 2260 ] |
| 2243 } | 2261 } |
| 2244 } | 2262 } |
| OLD | NEW |