| 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 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 "//content/public/android:content_java", | 437 "//content/public/android:content_java", |
| 438 "//content/public/test/android:content_java_test_support", | 438 "//content/public/test/android:content_java_test_support", |
| 439 "//third_party/android_tools:android_support_v13_java", | 439 "//third_party/android_tools:android_support_v13_java", |
| 440 "//third_party/android_tools:android_support_v7_appcompat_java", | 440 "//third_party/android_tools:android_support_v7_appcompat_java", |
| 441 "//ui/android:ui_java", | 441 "//ui/android:ui_java", |
| 442 ] | 442 ] |
| 443 DEPRECATED_java_in_dir = "shell/javatests/src" | 443 DEPRECATED_java_in_dir = "shell/javatests/src" |
| 444 } | 444 } |
| 445 | 445 |
| 446 # GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk | 446 # GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk |
| 447 android_apk("chrome_shell_test_apk") { | 447 instrumentation_test_apk("chrome_shell_test_apk") { |
| 448 testonly = true | |
| 449 apk_under_test = ":chrome_shell_apk" | 448 apk_under_test = ":chrome_shell_apk" |
| 450 deps = [ | 449 deps = [ |
| 451 ":chrome_javatests", | 450 ":chrome_javatests", |
| 452 ":chrome_shell_test_java", | 451 ":chrome_shell_test_java", |
| 453 "//sync/android:sync_javatests", | 452 "//sync/android:sync_javatests", |
| 454 "//testing/android/broker:broker_java", | |
| 455 "//ui/android:ui_javatests", | 453 "//ui/android:ui_javatests", |
| 456 ] | 454 ] |
| 457 datadeps = [ | |
| 458 "//testing/android/driver:driver_apk", | |
| 459 ] | |
| 460 apk_name = "ChromeShellTest" | 455 apk_name = "ChromeShellTest" |
| 461 android_manifest = "shell/javatests/AndroidManifest.xml" | 456 android_manifest = "shell/javatests/AndroidManifest.xml" |
| 457 isolate_file = "../chrome_shell_test_apk.isolate" |
| 462 } | 458 } |
| 463 | 459 |
| 464 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests | 460 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests |
| 465 junit_binary("chrome_junit_tests") { | 461 junit_binary("chrome_junit_tests") { |
| 466 java_files = [ | 462 java_files = [ |
| 467 "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java", | 463 "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java", |
| 468 "junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteContro
llerTest.java", | 464 "junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteContro
llerTest.java", |
| 469 "junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.jav
a", | 465 "junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.jav
a", |
| 470 "junit/src/org/chromium/chrome/browser/media/remote/RemoteVideoInfoTest.java
", | 466 "junit/src/org/chromium/chrome/browser/media/remote/RemoteVideoInfoTest.java
", |
| 471 "junit/src/org/chromium/chrome/browser/media/remote/TransportControlTest.jav
a", | 467 "junit/src/org/chromium/chrome/browser/media/remote/TransportControlTest.jav
a", |
| 472 ] | 468 ] |
| 473 deps = [ | 469 deps = [ |
| 474 ":chrome_java", | 470 ":chrome_java", |
| 475 "//base:base_java", | 471 "//base:base_java", |
| 476 "//base:base_java_test_support", | 472 "//base:base_java_test_support", |
| 477 "//third_party/junit:hamcrest", | 473 "//third_party/junit:hamcrest", |
| 478 "//third_party/android_tools:android_support_v7_mediarouter_java", | 474 "//third_party/android_tools:android_support_v7_mediarouter_java", |
| 479 ] | 475 ] |
| 480 } | 476 } |
| 481 | 477 |
| 482 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk | 478 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk |
| 483 if (false) { | 479 if (false) { |
| 484 # TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be p
orted. | 480 # TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be p
orted. |
| 485 # crbug.com/475612 | 481 # crbug.com/475612 |
| 486 android_apk("chrome_sync_shell_test_apk") { | 482 instrumentation_test_apk("chrome_sync_shell_test_apk") { |
| 487 apk_under_test = ":chrome_sync_shell_apk" | 483 apk_under_test = ":chrome_sync_shell_apk" |
| 488 testonly = true | |
| 489 deps = [ | 484 deps = [ |
| 490 ":chrome_java", | 485 ":chrome_java", |
| 491 ":chrome_shell_java", | 486 ":chrome_shell_java", |
| 492 ":chrome_shell_test_java", | 487 ":chrome_shell_test_java", |
| 493 "//base:base_java", | 488 "//base:base_java", |
| 494 "//base:base_java_test_support", | 489 "//base:base_java_test_support", |
| 495 "//chrome/test/android:chrome_java_test_support", | 490 "//chrome/test/android:chrome_java_test_support", |
| 496 "//components/invalidation:java", | 491 "//components/invalidation:java", |
| 497 "//content/public/android:content_java", | 492 "//content/public/android:content_java", |
| 498 "//content/public/test/android:content_java_test_support", | 493 "//content/public/test/android:content_java_test_support", |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 ] | 533 ] |
| 539 } | 534 } |
| 540 | 535 |
| 541 zip("chrome_version_srcjar") { | 536 zip("chrome_version_srcjar") { |
| 542 inputs = [ | 537 inputs = [ |
| 543 chrome_version_java_file, | 538 chrome_version_java_file, |
| 544 ] | 539 ] |
| 545 output = "$target_gen_dir/$target_name.srcjar" | 540 output = "$target_gen_dir/$target_name.srcjar" |
| 546 base_dir = chrome_version_java_dir | 541 base_dir = chrome_version_java_dir |
| 547 } | 542 } |
| OLD | NEW |