Android: Clarify android_manifest for android_library is only for lint.

Bug: 792315
Change-Id: I2809ba53f68694092535500b299f05a270d45119
Reviewed-on: https://chromium-review.googlesource.com/841725Reviewed-by: Xi Han <hanxi@chromium.org>
Reviewed-by: Lambros Lambrou <lambroslambrou@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#526516}

android_webview/BUILD.gn

@@ -882,8 +882,7 @@ android_library("android_webview_java") {
     "//components/safe_browsing/db:sb_threat_values",
   ]
 
-  # Manifest used for linting (determining unused resources).
-  android_manifest = system_webview_android_manifest
+  android_manifest_for_lint = system_webview_android_manifest
 }
 
 java_strings_grd("strings_grd") {

android_webview/tools/automated_ui_tests/BUILD.gn

@@ -30,8 +30,7 @@ android_library("webview_ui_test_app_java") {
     "//base:base_java",
   ]
 
-  # Manifest used for linting (determining unused resources).
-  android_manifest = "java/AndroidManifest.xml"
+  android_manifest_for_lint = "java/AndroidManifest.xml"
 }
 
 android_resources("webview_ui_test_app_apk_resources") {

build/config/android/internal_rules.gni

@@ -2403,6 +2403,13 @@ if (enable_java_templates) {
             "proguard_configs",
             "type",
           ])
+      if (type == "android_apk") {
+        forward_variables_from(invoker,
+                               [
+                                 "android_manifest",
+                                 "android_manifest_dep",
+                               ])
+      }
       build_config = _build_config
       is_prebuilt = _is_prebuilt
       possible_config_deps = _accumulated_deps
@@ -2411,14 +2418,6 @@ if (enable_java_templates) {
       bypass_platform_checks = defined(invoker.bypass_platform_checks) &&
                                invoker.bypass_platform_checks
 
-      if (type == "android_apk") {
-        # TODO(agrieve): forward this for all types once deps are fixed.
-        forward_variables_from(invoker,
-                               [
-                                 "android_manifest",
-                                 "android_manifest_dep",
-                               ])
-      }
       if (defined(_final_jar_path)) {
         jar_path = _final_jar_path
         ijar_path = _final_ijar_path
@@ -2491,7 +2490,13 @@ if (enable_java_templates) {
 
       if (_has_lint_target) {
         android_lint("${_main_target_name}__lint") {
+          # TODO(agrieve): Move this forward into the if block once downstream
+          #     is updated.
           forward_variables_from(invoker, [ "android_manifest" ])
+          if (invoker.type == "android_apk") {
+          } else if (defined(invoker.android_manifest_for_lint)) {
+            android_manifest = invoker.android_manifest_for_lint
+          }
           build_config = _build_config
           jar_path = _javac_jar_path
           deps = _accumulated_deps

build/config/android/rules.gni

@@ -715,8 +715,8 @@ if (enable_java_templates) {
   #   generated_resource_files: List of all files in |generated_resource_dirs|.
   #     |generated_resource_dirs| must be specified in |generated_resource_files|
   #     is specified.
-  #   android_manifest: AndroidManifest.xml for this target. Defaults to
-  #     //build/android/AndroidManifest.xml.
+  #   android_manifest: AndroidManifest.xml for this target (optional). Will be
+  #     merged into apks that directly or indirectly depend on this target.
   #   android_manifest_dep: Target that generates AndroidManifest (if applicable)
   #   custom_package: java package for generated .java files.
   #   v14_skip: If true, don't run v14 resource generator on this. Defaults to
@@ -1565,7 +1565,10 @@ if (enable_java_templates) {
   # This target creates an Android library containing java code and Android
   # resources.
   #
-  # Supports all variables of java_library().
+  # Supports all variables of java_library(), plus:
+  #   android_manifest_for_lint: Path to AndroidManifest.xml (optional). This
+  #     manifest will be used by Android lint, but will not be merged into apks.
+  #     To have a manifest merged, add it to an android_resources() target.
   #   deps: In addition to defining java deps, this can also include
   #     android_assets() and android_resources() targets.
   #   dex_path: If set, the resulting .dex.jar file will be placed under this

chrome/android/BUILD.gn

@@ -303,8 +303,7 @@ android_library("chrome_java") {
     "//components/supervised_user_error_page:enums_srcjar",
   ]
 
-  # Manifest used for linting (determining unused resources).
-  android_manifest = chrome_public_android_manifest
+  android_manifest_for_lint = chrome_public_android_manifest
 
   # From java_sources.gni.
   java_files = chrome_java_sources + [ app_hooks_impl ]

chrome/android/webapk/shell_apk/BUILD.gn

@@ -64,8 +64,7 @@ android_library("webapk_java") {
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
   ]
 
-  # Manifest used for linting (determining unused resources).
-  android_manifest = shell_apk_manifest
+  android_manifest_for_lint = shell_apk_manifest
 }
 
 template("webapk_tmpl") {

content/shell/android/BUILD.gn

@@ -81,8 +81,7 @@ android_library("content_shell_java") {
     "java/src/org/chromium/content_shell/ShellViewAndroidDelegate.java",
   ]
 
-  # Manifest used for linting (determining unused resources).
-  android_manifest = content_shell_manifest
+  android_manifest_for_lint = content_shell_manifest
 }
 
 jinja_template("content_shell_manifest") {
@@ -118,8 +117,7 @@ android_library("content_shell_apk_java") {
     "//ui/android:ui_java",
   ]
 
-  # Supply manifest for linting.
-  android_manifest = content_shell_manifest
+  android_manifest_for_lint = content_shell_manifest
 
   java_files = [
     "shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestHelperService.java",

remoting/android/client_java_tmpl.gni

@@ -105,7 +105,7 @@ template("remoting_android_client_java_tmpl") {
       deps += [ invoker.remoting_google_play_services_library ]
     }
 
-    # Manifest used for linting (determining unused resources).
-    android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml"
+    android_manifest_for_lint =
+        "$root_gen_dir/remoting/android/AndroidManifest.xml"
   }
 }