Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(425)

Side by Side Diff: chrome/android/BUILD.gn

Issue 1072193011: Enforce that apk_under_test is used (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-dex-test-exclude
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/config/android/rules.gni ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 "//third_party/android_tools:android_support_v13_java", 444 "//third_party/android_tools:android_support_v13_java",
445 "//third_party/android_tools:android_support_v7_appcompat_java", 445 "//third_party/android_tools:android_support_v7_appcompat_java",
446 "//ui/android:ui_java", 446 "//ui/android:ui_java",
447 ] 447 ]
448 DEPRECATED_java_in_dir = "shell/javatests/src" 448 DEPRECATED_java_in_dir = "shell/javatests/src"
449 } 449 }
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 apk_under_test = ":chrome_shell_apk"
454 deps = [ 455 deps = [
455 ":chrome_javatests", 456 ":chrome_javatests",
456 ":chrome_shell_test_java", 457 ":chrome_shell_test_java",
457 "//sync/android:sync_javatests", 458 "//sync/android:sync_javatests",
458 "//ui/android:ui_javatests", 459 "//ui/android:ui_javatests",
459 ] 460 ]
460 apk_name = "ChromeShellTest" 461 apk_name = "ChromeShellTest"
461 android_manifest = "shell/javatests/AndroidManifest.xml" 462 android_manifest = "shell/javatests/AndroidManifest.xml"
462 } 463 }
463 464
464 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests 465 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests
465 junit_binary("chrome_junit_tests") { 466 junit_binary("chrome_junit_tests") {
466 java_files = 467 java_files =
467 [ "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java" ] 468 [ "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java" ]
468 deps = [ 469 deps = [
469 ":chrome_java", 470 ":chrome_java",
470 "//base:base_java", 471 "//base:base_java",
471 "//base:base_java_test_support", 472 "//base:base_java_test_support",
472 ] 473 ]
473 } 474 }
474 475
475 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk 476 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk
476 if (false) { 477 if (false) {
477 # TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be p orted. 478 # TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be p orted.
478 # crbug.com/475612 479 # crbug.com/475612
479 android_apk("chrome_sync_shell_test_apk") { 480 android_apk("chrome_sync_shell_test_apk") {
481 apk_under_test = ":chrome_sync_shell_apk"
480 testonly = true 482 testonly = true
481 deps = [ 483 deps = [
482 ":chrome_java", 484 ":chrome_java",
483 ":chrome_shell_java", 485 ":chrome_shell_java",
484 ":chrome_shell_test_java", 486 ":chrome_shell_test_java",
485 "//base:base_java", 487 "//base:base_java",
486 "//base:base_java_test_support", 488 "//base:base_java_test_support",
487 "//chrome/test/android:chrome_java_test_support", 489 "//chrome/test/android:chrome_java_test_support",
488 "//components/invalidation:java", 490 "//components/invalidation:java",
489 "//content/public/android:content_java", 491 "//content/public/android:content_java",
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 ] 532 ]
531 } 533 }
532 534
533 zip("chrome_version_srcjar") { 535 zip("chrome_version_srcjar") {
534 inputs = [ 536 inputs = [
535 chrome_version_java_file, 537 chrome_version_java_file,
536 ] 538 ]
537 output = "$target_gen_dir/$target_name.srcjar" 539 output = "$target_gen_dir/$target_name.srcjar"
538 base_dir = chrome_version_java_dir 540 base_dir = chrome_version_java_dir
539 } 541 }
OLDNEW
« no previous file with comments | « build/config/android/rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698