Android: including AndroidManifests in test sdks

Bug: 898251
Change-Id: I552b1dfbe7d1cdd86f5cfdbf0116b895d255b903
Reviewed-on: https://chromium-review.googlesource.com/c/1320023Reviewed-by: Sam Maier <smaier@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606628}

build/secondary/third_party/android_tools/AndroidManifest.xml.jinja2

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018 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. -->
+
+<!-- package name must be unique -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.android.test_{{ library_name }}">
+    <application>
+      <uses-library android:name="android.test.{{ library_name }}"
+                    android:required="false" />
+    </application>
+</manifest>

build/secondary/third_party/android_tools/BUILD.gn

@@ -35,18 +35,48 @@ if (enable_java_templates) {
     jar_path = android_sdk_jar
   }
 
+  template("android_test_jar_with_manifest") {
+    _library_name = invoker.library_name
+
+    _manifest_output_path = "$target_gen_dir/$target_name/AndroidManifest.xml"
+    _manifest_target = "${target_name}__manifest"
+    jinja_template(_manifest_target) {
+      testonly = true
+      input = "//build/secondary/third_party/android_tools/AndroidManifest.xml.jinja2"
+      output = _manifest_output_path
+      variables = [ "library_name=$_library_name" ]
+    }
+
+    _resources_target = "${target_name}__resources"
+    android_resources(_resources_target) {
+      testonly = true
+      resource_dirs = []
+      android_manifest = _manifest_output_path
+      android_manifest_dep = ":$_manifest_target"
+    }
+
+    java_group(target_name) {
+      testonly = true
+      deps = [
+        ":$_resources_target",
+      ]
+      input_jars_paths =
+          [ "${android_sdk}/optional/android.test.${_library_name}.jar" ]
+    }
+  }
+
   # The android test libraries below are part of the main SDK jar
   # and are linked by default on O and below. Starting in P, they
   # exist in their own libraries that are present on device and are
   # available to be linked against but aren't linked by default.
-  java_group("android_test_base_java") {
-    input_jars_paths = [ "${android_sdk}/optional/android.test.base.jar" ]
+  android_test_jar_with_manifest("android_test_base_java") {
+    library_name = "base"
   }
-  java_group("android_test_mock_java") {
-    input_jars_paths = [ "${android_sdk}/optional/android.test.mock.jar" ]
+  android_test_jar_with_manifest("android_test_mock_java") {
+    library_name = "mock"
   }
-  java_group("android_test_runner_java") {
-    input_jars_paths = [ "${android_sdk}/optional/android.test.runner.jar" ]
+  android_test_jar_with_manifest("android_test_runner_java") {
+    library_name = "runner"
   }
 
   android_library("android_support_chromium_java") {

chrome/android/javatests/AndroidManifest.xml

@@ -12,8 +12,6 @@
 {% endblock %}
 
 {% block extra_application_definitions_for_test %}
-        <uses-library android:name="android.test.runner" />
-
         <provider android:name="org.chromium.chrome.test.TestContentProvider"
             android:authorities="org.chromium.chrome.test.TestContentProvider"
             android:exported="true" />