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

Side by Side Diff: components/cronet/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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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/buildflag_header.gni") 5 import("//build/buildflag_header.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/util/version.gni") 9 import("//build/util/version.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 ] 465 ]
466 466
467 deps = [ 467 deps = [
468 ":cronet_api_java", 468 ":cronet_api_java",
469 ":cronet_impl_all_java", 469 ":cronet_impl_all_java",
470 ":cronet_sample_apk_java", 470 ":cronet_sample_apk_java",
471 ":cronet_sample_test_apk_resources", 471 ":cronet_sample_test_apk_resources",
472 "//base:base_java", 472 "//base:base_java",
473 "//base:base_java_test_support", 473 "//base:base_java_test_support",
474 "//net/android:net_java_test_support", 474 "//net/android:net_java_test_support",
475 "//third_party/android_support_test_runner:runner_java",
475 ] 476 ]
476 additional_apks = [ "//net/android:net_test_support_apk" ] 477 additional_apks = [ "//net/android:net_test_support_apk" ]
477 478
478 run_findbugs_override = true 479 run_findbugs_override = true
479 proguard_enabled = true 480 proguard_enabled = true
480 } 481 }
481 482
482 generate_jni("cronet_tests_jni_headers") { 483 generate_jni("cronet_tests_jni_headers") {
483 testonly = true 484 testonly = true
484 sources = [ 485 sources = [
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 ] 688 ]
688 689
689 deps = [ 690 deps = [
690 ":cronet_api_java", 691 ":cronet_api_java",
691 ":cronet_impl_all_java", 692 ":cronet_impl_all_java",
692 ":cronet_test_apk_java", 693 ":cronet_test_apk_java",
693 "//base:base_java", 694 "//base:base_java",
694 "//base:base_java_test_support", 695 "//base:base_java_test_support",
695 "//net/android:net_java", 696 "//net/android:net_java",
696 "//net/android:net_java_test_support", 697 "//net/android:net_java_test_support",
698 "//third_party/android_support_test_runner:runner_java",
697 ] 699 ]
698 700
699 run_findbugs_override = true 701 run_findbugs_override = true
700 } 702 }
701 703
702 instrumentation_test_apk("cronet_test_instrumentation_apk") { 704 instrumentation_test_apk("cronet_test_instrumentation_apk") {
703 apk_name = "CronetTestInstrumentation" 705 apk_name = "CronetTestInstrumentation"
704 apk_under_test = ":cronet_test_apk" 706 apk_under_test = ":cronet_test_apk"
705 android_manifest = "test/javatests/AndroidManifest.xml" 707 android_manifest = "test/javatests/AndroidManifest.xml"
706 708
707 deps = [ 709 deps = [
708 ":cronet_api_java", 710 ":cronet_api_java",
709 ":cronet_impl_all_java", 711 ":cronet_impl_all_java",
710 ":cronet_javatests", 712 ":cronet_javatests",
711 ":cronet_test_apk_java", 713 ":cronet_test_apk_java",
712 "//base:base_java", 714 "//base:base_java",
713 "//base:base_java_test_support", 715 "//base:base_java_test_support",
714 "//net/android:net_java", 716 "//net/android:net_java",
715 "//net/android:net_java_test_support", 717 "//net/android:net_java_test_support",
718 "//third_party/android_support_test_runner:runner_java",
716 ] 719 ]
717 additional_apks = [ "//net/android:net_test_support_apk" ] 720 additional_apks = [ "//net/android:net_test_support_apk" ]
718 721
719 data_deps = [ 722 data_deps = [
720 "//net:test_support", 723 "//net:test_support",
721 ] 724 ]
722 725
723 run_findbugs_override = true 726 run_findbugs_override = true
724 } 727 }
725 728
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
1289 deps = [ 1292 deps = [
1290 ":cronet_package_copy_native_test_lib", 1293 ":cronet_package_copy_native_test_lib",
1291 ":cronet_package_copy_native_test_lib_unstripped", 1294 ":cronet_package_copy_native_test_lib_unstripped",
1292 ":cronet_package_copy_test_assets", 1295 ":cronet_package_copy_test_assets",
1293 ":cronet_package_copy_test_files", 1296 ":cronet_package_copy_test_files",
1294 ":cronet_package_copy_test_support_apks", 1297 ":cronet_package_copy_test_support_apks",
1295 ":repackage_extracted_test_jars", 1298 ":repackage_extracted_test_jars",
1296 ] 1299 ]
1297 } 1300 }
1298 } 1301 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698