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