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

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

Issue 2583933003: Replace deprecated Android java test annotations (Closed)
Patch Set: Rebase again :( Created 3 years, 12 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
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("//android_webview/webview_repack_locales_list.gni") 5 import("//android_webview/webview_repack_locales_list.gni")
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/android/rules.gni") 7 import("//build/config/android/rules.gni")
8 import("//build/util/process_version.gni") 8 import("//build/util/process_version.gni")
9 import("//build_overrides/v8.gni") 9 import("//build_overrides/v8.gni")
10 import("//chrome/android/chrome_public_apk_tmpl.gni") 10 import("//chrome/android/chrome_public_apk_tmpl.gni")
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 "//content/public/test/android:content_java_test_support", 430 "//content/public/test/android:content_java_test_support",
431 "//device/geolocation:geolocation_java", 431 "//device/geolocation:geolocation_java",
432 "//device/geolocation:geolocation_java_test_support", 432 "//device/geolocation:geolocation_java_test_support",
433 "//mojo/public/java:bindings_java", 433 "//mojo/public/java:bindings_java",
434 "//mojo/public/java:system_java", 434 "//mojo/public/java:system_java",
435 "//net/android:net_java", 435 "//net/android:net_java",
436 "//net/android:net_java_test_support", 436 "//net/android:net_java_test_support",
437 "//printing:printing_java", 437 "//printing:printing_java",
438 "//third_party/WebKit/public:android_mojo_bindings_java", 438 "//third_party/WebKit/public:android_mojo_bindings_java",
439 "//third_party/WebKit/public:blink_headers_java", 439 "//third_party/WebKit/public:blink_headers_java",
440 "//third_party/android_support_test_runner:runner_java",
440 "//third_party/android_tools:android_support_design_java", 441 "//third_party/android_tools:android_support_design_java",
441 "//third_party/android_tools:android_support_v7_appcompat_java", 442 "//third_party/android_tools:android_support_v7_appcompat_java",
442 "//third_party/android_tools:android_support_v7_recyclerview_java", 443 "//third_party/android_tools:android_support_v7_recyclerview_java",
443 "//third_party/android_tools:legacy_http_javalib", 444 "//third_party/android_tools:legacy_http_javalib",
444 "//third_party/cacheinvalidation:cacheinvalidation_javalib", 445 "//third_party/cacheinvalidation:cacheinvalidation_javalib",
445 "//third_party/custom_tabs_client:custom_tabs_support_java", 446 "//third_party/custom_tabs_client:custom_tabs_support_java",
446 "//third_party/jsr-305:jsr_305_javalib", 447 "//third_party/jsr-305:jsr_305_javalib",
447 "//ui/android:ui_java", 448 "//ui/android:ui_java",
448 "//ui/android:ui_javatests", 449 "//ui/android:ui_javatests",
449 google_play_services_library, 450 google_play_services_library,
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 instrumentation_test_apk("chrome_public_test_apk") { 749 instrumentation_test_apk("chrome_public_test_apk") {
749 apk_name = "ChromePublicTest" 750 apk_name = "ChromePublicTest"
750 apk_under_test = ":chrome_public_apk" 751 apk_under_test = ":chrome_public_apk"
751 android_manifest = chrome_public_test_apk_manifest 752 android_manifest = chrome_public_test_apk_manifest
752 android_manifest_dep = ":chrome_public_test_apk_manifest" 753 android_manifest_dep = ":chrome_public_test_apk_manifest"
753 754
754 deps = [ 755 deps = [
755 ":chrome_test_java", 756 ":chrome_test_java",
756 "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests", 757 "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests",
757 "//chrome/android/webapk/shell_apk:shell_apk_javatests", 758 "//chrome/android/webapk/shell_apk:shell_apk_javatests",
759 "//third_party/android_support_test_runner:runner_java",
758 ] 760 ]
759 additional_apks = [ 761 additional_apks = [
760 "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_serv ice:apk_with_webapk_service", 762 "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_serv ice:apk_with_webapk_service",
761 "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk ", 763 "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk ",
762 "//chrome/test/android/chrome_public_test_support:chrome_public_test_support _apk", 764 "//chrome/test/android/chrome_public_test_support:chrome_public_test_support _apk",
763 "//net/android:net_test_support_apk", 765 "//net/android:net_test_support_apk",
764 ] 766 ]
765 proguard_enabled = !is_java_debug 767 proguard_enabled = !is_java_debug
766 } 768 }
767 769
(...skipping 10 matching lines...) Expand all
778 "//chrome/test/android:chrome_java_test_support", 780 "//chrome/test/android:chrome_java_test_support",
779 "//components/bookmarks/common/android:bookmarks_java", 781 "//components/bookmarks/common/android:bookmarks_java",
780 "//components/policy/android:policy_java", 782 "//components/policy/android:policy_java",
781 "//components/signin/core/browser/android:signin_java_test_support", 783 "//components/signin/core/browser/android:signin_java_test_support",
782 "//components/sync:sync_java_test_support", 784 "//components/sync:sync_java_test_support",
783 "//components/sync:test_support_proto_java", 785 "//components/sync:test_support_proto_java",
784 "//components/sync/android:sync_java", 786 "//components/sync/android:sync_java",
785 "//content/public/android:content_java", 787 "//content/public/android:content_java",
786 "//content/public/test/android:content_java_test_support", 788 "//content/public/test/android:content_java_test_support",
787 "//third_party/android_protobuf:protobuf_nano_javalib", 789 "//third_party/android_protobuf:protobuf_nano_javalib",
790 "//third_party/android_support_test_runner:runner_java",
788 "//third_party/android_tools:android_support_v7_appcompat_java", 791 "//third_party/android_tools:android_support_v7_appcompat_java",
789 "//ui/android:ui_java", 792 "//ui/android:ui_java",
790 ] 793 ]
791 } 794 }
792 795
793 instrumentation_test_apk("chrome_sync_shell_test_apk") { 796 instrumentation_test_apk("chrome_sync_shell_test_apk") {
794 apk_name = "ChromeSyncShellTest" 797 apk_name = "ChromeSyncShellTest"
795 apk_under_test = ":chrome_sync_shell_apk" 798 apk_under_test = ":chrome_sync_shell_apk"
796 android_manifest = chrome_sync_shell_test_apk_manifest 799 android_manifest = chrome_sync_shell_test_apk_manifest
797 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 800 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
798 deps = [ 801 deps = [
799 ":chrome_sync_shell_test_apk_java", 802 ":chrome_sync_shell_test_apk_java",
803 "//third_party/android_support_test_runner:runner_java",
800 ] 804 ]
801 proguard_enabled = !is_java_debug 805 proguard_enabled = !is_java_debug
802 } 806 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698