| 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 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 ":chrome_shell_test_java", | 457 ":chrome_shell_test_java", |
| 458 "//sync/android:sync_javatests", | 458 "//sync/android:sync_javatests", |
| 459 "//ui/android:ui_javatests", | 459 "//ui/android:ui_javatests", |
| 460 ] | 460 ] |
| 461 apk_name = "ChromeShellTest" | 461 apk_name = "ChromeShellTest" |
| 462 android_manifest = "shell/javatests/AndroidManifest.xml" | 462 android_manifest = "shell/javatests/AndroidManifest.xml" |
| 463 } | 463 } |
| 464 | 464 |
| 465 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests | 465 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests |
| 466 junit_binary("chrome_junit_tests") { | 466 junit_binary("chrome_junit_tests") { |
| 467 java_files = | 467 java_files = [ |
| 468 [ "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java" ] | 468 "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java", |
| 469 "junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.jav
a", |
| 470 "junit/src/org/chromium/chrome/browser/media/remote/RemoteVideoInfoTest.java
", |
| 471 "junit/src/org/chromium/chrome/browser/media/remote/TransportControlTest.jav
a", |
| 472 ] |
| 469 deps = [ | 473 deps = [ |
| 470 ":chrome_java", | 474 ":chrome_java", |
| 471 "//base:base_java", | 475 "//base:base_java", |
| 472 "//base:base_java_test_support", | 476 "//base:base_java_test_support", |
| 477 "//third_party/junit:hamcrest", |
| 473 ] | 478 ] |
| 474 } | 479 } |
| 475 | 480 |
| 476 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk | 481 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk |
| 477 if (false) { | 482 if (false) { |
| 478 # TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be p
orted. | 483 # TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be p
orted. |
| 479 # crbug.com/475612 | 484 # crbug.com/475612 |
| 480 android_apk("chrome_sync_shell_test_apk") { | 485 android_apk("chrome_sync_shell_test_apk") { |
| 481 apk_under_test = ":chrome_sync_shell_apk" | 486 apk_under_test = ":chrome_sync_shell_apk" |
| 482 testonly = true | 487 testonly = true |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 ] | 537 ] |
| 533 } | 538 } |
| 534 | 539 |
| 535 zip("chrome_version_srcjar") { | 540 zip("chrome_version_srcjar") { |
| 536 inputs = [ | 541 inputs = [ |
| 537 chrome_version_java_file, | 542 chrome_version_java_file, |
| 538 ] | 543 ] |
| 539 output = "$target_gen_dir/$target_name.srcjar" | 544 output = "$target_gen_dir/$target_name.srcjar" |
| 540 base_dir = chrome_version_java_dir | 545 base_dir = chrome_version_java_dir |
| 541 } | 546 } |
| OLD | NEW |