Cronet: Merge apk_under_test into instrumentation_test_apk targets

Except for sample_apk, which looks like it's a valid app on its own.

Motivation:
 * Trying to add a new JNI generator, and these targets were being
 difficult due to the tests having (unused) native methods that the
 under_test apk did not have.
 * The under_test apks didn't really make sense on their own anyways, so
 it's more efficent to just combine them.

Bug: 898261
Change-Id: I23571ea61230daefccb8e0e14689d3f872080136
Reviewed-on: https://chromium-review.googlesource.com/c/1352853Reviewed-by: Paul Jensen <pauljensen@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612791}

BUILD.gn

@@ -334,7 +334,6 @@ group("gn_all") {
         "//components/cronet/android:cronet_perf_test_apk",
         "//components/cronet/android:cronet_sample_apk",
         "//components/cronet/android:cronet_sample_test_apk",
-        "//components/cronet/android:cronet_test_apk",
         "//components/cronet/android:cronet_test_instrumentation_apk",
         "//components/cronet/android:cronet_unittests_android",
       ]

components/cronet/android/BUILD.gn

@@ -728,11 +728,11 @@ if (!is_component_build) {
 
   android_resources("cronet_test_apk_resources") {
     testonly = true
+    custom_package = "org.chromium.net"
     resource_dirs = [
       "test/res",
       "test/smoketests/res/native",
     ]
-    android_manifest = "test/AndroidManifest.xml"
   }
 
   android_library("cronet_test_apk_java") {
@@ -776,50 +776,6 @@ if (!is_component_build) {
                                            "test/smoketests/src/org/chromium/net/smoke/NativeCronetTestRule.java",
                                          ]
 
-  android_library("cronet_smoketests_native_java") {
-    testonly = true
-    java_files = [
-                   "test/smoketests/src/org/chromium/net/smoke/Http2Test.java",
-                   "test/smoketests/src/org/chromium/net/smoke/QuicTest.java",
-                 ] + cronet_smoketests_native_common_srcs
-
-    deps = [
-      ":cronet_api_java",
-      ":cronet_test_apk_java",
-      "//base:base_java",
-      "//base:base_java_test_support",
-      "//third_party/android_support_test_runner:runner_java",
-      "//third_party/junit",
-      "//third_party/netty4:netty_all_java",
-    ]
-  }
-
-  android_apk("cronet_test_apk") {
-    testonly = true
-    apk_name = "CronetTest"
-    android_manifest = "test/AndroidManifest.xml"
-    shared_libraries = [
-      ":cronet",
-      ":cronet_tests",
-    ]
-    loadable_modules = [ "$root_out_dir/libnetty-tcnative.so" ]
-
-    deps = [
-      ":cronet_combine_proguard_flags",
-      ":cronet_test_apk_resources",
-      "//base:base_java",
-      "//third_party/netty-tcnative:netty-tcnative-so",
-    ]
-
-    proguard_enabled = true
-
-    proguard_configs = [
-      "$target_gen_dir/cronet_impl_native_proguard.cfg",
-      "cronet_impl_common_proguard.cfg",
-      "cronet_impl_platform_proguard.cfg",
-    ]
-  }
-
   cronet_javatests_deps_to_package = [
     ":cronet_test_apk_java",
     "//base:base_java",
@@ -892,15 +848,26 @@ if (!is_component_build) {
 
   instrumentation_test_apk("cronet_test_instrumentation_apk") {
     apk_name = "CronetTestInstrumentation"
-    apk_under_test = ":cronet_test_apk"
     android_manifest = "test/javatests/AndroidManifest.xml"
 
+    shared_libraries = [
+      ":cronet",
+      ":cronet_tests",
+    ]
+    loadable_modules = [ "$root_out_dir/libnetty-tcnative.so" ]
+
+    java_files = cronet_smoketests_native_common_srcs + [
+                   "test/smoketests/src/org/chromium/net/smoke/Http2Test.java",
+                   "test/smoketests/src/org/chromium/net/smoke/QuicTest.java",
+                 ]
+
     deps = [
       ":cronet_api_java",
+      ":cronet_combine_proguard_flags",
       ":cronet_impl_all_java",
       ":cronet_javatests",
-      ":cronet_smoketests_native_java",
       ":cronet_test_apk_java",
+      ":cronet_test_apk_resources",
       "//base:base_java",
       "//base:base_java_test_support",
       "//net/android:net_java",
@@ -908,6 +875,9 @@ if (!is_component_build) {
       "//third_party/android_support_test_runner:runner_java",
       "//third_party/android_tools:android_test_mock_java",
       "//third_party/hamcrest:hamcrest_core_java",
+      "//third_party/junit",
+      "//third_party/netty-tcnative:netty-tcnative-so",
+      "//third_party/netty4:netty_all_java",
     ]
     additional_apks = [ "//net/android:net_test_support_apk" ]
 
@@ -917,127 +887,78 @@ if (!is_component_build) {
 
     proguard_enabled = true
 
-    proguard_configs = [ "test/proguard.cfg" ]
+    proguard_configs = [
+      "$target_gen_dir/cronet_impl_native_proguard.cfg",
+      "cronet_impl_common_proguard.cfg",
+      "cronet_impl_platform_proguard.cfg",
+      "test/proguard.cfg",
+    ]
   }
 
   android_resources("cronet_smoketests_platform_only_apk_resources") {
     testonly = true
+    custom_package = "org.chromium.net"
     resource_dirs = [ "test/smoketests/res/platform_only" ]
-    android_manifest = "test/AndroidManifest.xml"
   }
 
-  android_library("cronet_smoketests_platform_only_java") {
-    testonly = true
-    java_files = [ "test/smoketests/src/org/chromium/net/smoke/PlatformOnlyEngineTest.java" ] + cronet_smoketests_platform_only_common_srcs
+  instrumentation_test_apk(
+      "cronet_smoketests_platform_only_instrumentation_apk") {
+    apk_name = "PlatformOnlyEngineSmokeTestInstrumentation"
+    android_manifest = "test/javatests/AndroidManifest.xml"
+
+    java_files = cronet_smoketests_platform_only_common_srcs + [
+                   "test/src/org/chromium/net/CronetTestApplication.java",
+                   "test/smoketests/src/org/chromium/net/smoke/PlatformOnlyEngineTest.java",
+                 ]
+
     deps = [
       ":cronet_api_java",
+      ":cronet_impl_common_base_java",
+      ":cronet_impl_platform_base_java",
+      ":cronet_smoketests_platform_only_apk_resources",
       "//base:base_java_test_support",
       "//third_party/android_support_test_runner:runner_java",
+      "//third_party/android_tools:android_test_mock_java",
       "//third_party/junit",
       "//third_party/netty4:netty_all_java",
     ]
-  }
-
-  android_apk("cronet_smoketests_platform_only_apk") {
-    testonly = true
-    apk_name = "PlatformOnlyEngineSmokeTest"
-    android_manifest = "test/AndroidManifest.xml"
-    java_files = [ "test/src/org/chromium/net/CronetTestApplication.java" ]
 
     proguard_enabled = true
+
     proguard_configs = [
       "cronet_impl_common_proguard.cfg",
       "cronet_impl_platform_proguard.cfg",
-    ]
-
-    deps = [
-      ":cronet_api_java",
-      ":cronet_impl_common_base_java",
-      ":cronet_impl_platform_base_java",
-      ":cronet_smoketests_platform_only_apk_resources",
+      "test/proguard.cfg",
     ]
   }
 
   instrumentation_test_apk(
-      "cronet_smoketests_platform_only_instrumentation_apk") {
-    apk_name = "PlatformOnlyEngineSmokeTestInstrumentation"
-    apk_under_test = ":cronet_smoketests_platform_only_apk"
+      "cronet_smoketests_missing_native_library_instrumentation_apk") {
+    apk_name = "MissingNativeLibrarySmokeTestInstrumentation"
     android_manifest = "test/javatests/AndroidManifest.xml"
-    deps = [
-      ":cronet_smoketests_platform_only_java",
-      "//base:base_java_test_support",
-      "//third_party/android_support_test_runner:runner_java",
-      "//third_party/android_tools:android_test_mock_java",
-    ]
 
-    proguard_enabled = true
-
-    proguard_configs = [ "test/proguard.cfg" ]
-  }
-
-  android_library("cronet_smoketests_missing_native_library_java") {
-    testonly = true
-    java_files = [ "test/smoketests/src/org/chromium/net/smoke/MissingNativeLibraryTest.java" ] + cronet_smoketests_native_common_srcs
+    java_files = cronet_smoketests_native_common_srcs + [ "test/smoketests/src/org/chromium/net/smoke/MissingNativeLibraryTest.java" ]
     deps = [
       ":cronet_api_java",
+      ":cronet_combine_proguard_flags",
+      ":cronet_impl_common_base_java",
+      ":cronet_impl_platform_base_java",
       ":cronet_test_apk_java",
+      ":cronet_test_apk_resources",
       "//base:base_java",
       "//base:base_java_test_support",
       "//third_party/android_support_test_runner:runner_java",
+      "//third_party/android_tools:android_test_mock_java",
       "//third_party/junit",
       "//third_party/netty4:netty_all_java",
     ]
-  }
-
-  android_apk("cronet_smoketests_missing_native_library_apk") {
-    testonly = true
-    apk_name = "MissingNativeLibrarySmokeTest"
-    android_manifest = "test/AndroidManifest.xml"
-    deps = [
-      ":cronet_api_java",
-      ":cronet_combine_proguard_flags",
-      ":cronet_impl_common_base_java",
-      ":cronet_impl_platform_base_java",
-      ":cronet_test_apk_resources",
-    ]
 
     proguard_enabled = true
     proguard_configs = [
       "$target_gen_dir/cronet_impl_native_proguard.cfg",
       "cronet_impl_common_proguard.cfg",
       "cronet_impl_platform_proguard.cfg",
-    ]
-  }
-
-  instrumentation_test_apk(
-      "cronet_smoketests_missing_native_library_instrumentation_apk") {
-    apk_name = "MissingNativeLibrarySmokeTestInstrumentation"
-    apk_under_test = ":cronet_smoketests_missing_native_library_apk"
-    android_manifest = "test/javatests/AndroidManifest.xml"
-
-    deps = [
-      ":cronet_smoketests_missing_native_library_java",
-      "//third_party/android_tools:android_test_mock_java",
-    ]
-
-    proguard_enabled = true
-
-    proguard_configs = [ "test/proguard.cfg" ]
-  }
-
-  android_library("cronet_perf_test_apk_java") {
-    testonly = true
-    android_manifest_for_lint = "test/javaperftests/AndroidManifest.xml"
-    java_files = [
-      "test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java",
-    ]
-
-    deps = [
-      ":cronet_api_java",
-      ":cronet_impl_all_java",
-      ":cronet_javatests",
-      ":cronet_test_apk_java",
-      "//base:base_java",
+      "test/proguard.cfg",
     ]
   }
 
@@ -1050,12 +971,19 @@ if (!is_component_build) {
       ":cronet_tests",
     ]
 
+    java_files = [
+      "test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java",
+    ]
+
     deps = [
+      ":cronet_api_java",
       ":cronet_combine_proguard_flags",
-      ":cronet_perf_test_apk_java",
+      ":cronet_impl_all_java",
+      ":cronet_javatests",
       ":cronet_test_apk_java",
       "//base:base_java",
       "//third_party/android_tools:android_test_mock_java",
+      "//third_party/junit",
     ]
 
     proguard_enabled = true

components/cronet/android/test/AndroidManifest.xml

-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright 2014 The Chromium Authors. All rights reserved.
-
-     Use of this source code is governed by a BSD-style license that can be
-     found in the LICENSE file.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.chromium.net">
-
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <application android:name="CronetTestApplication"
-                 android:label="Cronet Test"
-                 android:networkSecurityConfig="@xml/network_security_config">
-    </application>
-</manifest>

components/cronet/android/test/javatests/AndroidManifest.xml

@@ -4,20 +4,19 @@
        Use of this source code is governed by a BSD-style license that can be
        found in the LICENSE file.
    -->
-  <!-- package name must be unique so suffix with "tests" so package loader
-       doesn't ignore this. -->
   <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.chromium.net.tests">
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
     <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
-    <!-- We add an application tag here just so that we can indicate that this
-         package needs to link against the android.test library, which is
-         needed when building test cases. -->
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
+    <application android:name="org.chromium.net.CronetTestApplication"
+                 android:label="Cronet Test"
+                 android:networkSecurityConfig="@xml/network_security_config" />
     <instrumentation android:name="org.chromium.base.test.BaseChromiumAndroidJUnitRunner"
-        android:targetPackage="org.chromium.net"
+        android:targetPackage="org.chromium.net.tests"
         android:label="Tests for org.chromium.net">
         <!-- Meta data used for BaseChromiumAndroidJUnitRunner to scan only
              one package path for potential tests -->