| 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/android/config.gni") | 5 import("//build/config/android/config.gni") |
| 6 import("//build/config/android/rules.gni") | 6 import("//build/config/android/rules.gni") |
| 7 import("//build/module_args/v8.gni") | 7 import("//build/module_args/v8.gni") |
| 8 import("//chrome/version.gni") | 8 import("//chrome/version.gni") |
| 9 import("//testing/test.gni") | 9 import("//testing/test.gni") |
| 10 import("//third_party/icu/config.gni") | 10 import("//third_party/icu/config.gni") |
| (...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 450 | 450 |
| 451 # GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk | 451 # GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk |
| 452 android_apk("chrome_shell_test_apk") { | 452 android_apk("chrome_shell_test_apk") { |
| 453 testonly = true | 453 testonly = true |
| 454 deps = [ | 454 deps = [ |
| 455 ":chrome_javatests", | 455 ":chrome_javatests", |
| 456 ":chrome_shell_test_java", | 456 ":chrome_shell_test_java", |
| 457 "//sync/android:sync_javatests", | 457 "//sync/android:sync_javatests", |
| 458 "//ui/android:ui_javatests", | 458 "//ui/android:ui_javatests", |
| 459 ] | 459 ] |
| 460 datadeps = [ |
| 461 "//testing/android/driver:driver_apk", |
| 462 ] |
| 460 apk_name = "ChromeShellTest" | 463 apk_name = "ChromeShellTest" |
| 461 android_manifest = "shell/javatests/AndroidManifest.xml" | 464 android_manifest = "shell/javatests/AndroidManifest.xml" |
| 462 } | 465 } |
| 463 | 466 |
| 464 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests | 467 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests |
| 465 junit_binary("chrome_junit_tests") { | 468 junit_binary("chrome_junit_tests") { |
| 466 java_files = | 469 java_files = |
| 467 [ "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java" ] | 470 [ "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java" ] |
| 468 deps = [ | 471 deps = [ |
| 469 ":chrome_java", | 472 ":chrome_java", |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 ] | 533 ] |
| 531 } | 534 } |
| 532 | 535 |
| 533 zip("chrome_version_srcjar") { | 536 zip("chrome_version_srcjar") { |
| 534 inputs = [ | 537 inputs = [ |
| 535 chrome_version_java_file, | 538 chrome_version_java_file, |
| 536 ] | 539 ] |
| 537 output = "$target_gen_dir/$target_name.srcjar" | 540 output = "$target_gen_dir/$target_name.srcjar" |
| 538 base_dir = chrome_version_java_dir | 541 base_dir = chrome_version_java_dir |
| 539 } | 542 } |
| OLD | NEW |