Android: Remove unused gn args for lint

Remove min_sdk_version and android_manifest_for_lint GN variables.
Remove the extra not_needed in internal_rules. It allowed time for
downstream projects to remove these args from their gn templates.

Commit after webrtc CL is merged into chromium:
https://webrtc-review.googlesource.com/c/src/+/174983

Previously, min_sdk_version was used to package our apks and to pass to
android lint for linting each java target. We've since migrated to
minSdkVersion being specified in our AndroidManifest.xml (thus no longer
using the GN min_sdk_version variable for apks). Since then it's only
been used for linting each java target.

I've migrated lint to only lint for apks and bundles, and so
min_sdk_version is only necessary for apks and bundles, not for any
other java target. Thus these GN variables are no longer used by
non-apk/bundle java targets (GN complains about them being unused).

Bug: 1017190
Change-Id: Ia75becae168fdd9151c91b14dc22e0c4ac5ca77f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2198608
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#768735}

android_webview/BUILD.gn

@@ -520,9 +520,6 @@ android_library("browser_java") {
     "//android_webview/browser:browser_enums",
     "//components/safe_browsing/core/db:sb_threat_values",
   ]
-
-  android_manifest_for_lint = system_webview_android_manifest
-  min_sdk_version = 21
 }
 
 android_library("common_metrics_java") {
@@ -595,7 +592,6 @@ android_library("common_crash_java") {
     "//components/minidump_uploader:minidump_uploader_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-  min_sdk_version = 21
 }
 
 android_library("common_java") {

android_webview/glue/BUILD.gn

@@ -78,7 +78,4 @@ android_library("glue") {
     "java/src/com/android/webview/chromium/WebViewRenderProcessClientAdapter.java",
     "java/src/com/android/webview/chromium/WebkitToSharedGlueConverter.java",
   ]
-
-  android_manifest_for_lint = system_webview_android_manifest
-  min_sdk_version = 21
 }

android_webview/nonembedded/BUILD.gn

@@ -62,8 +62,6 @@ android_library("devui_java") {
     "//third_party/android_deps:androidx_fragment_fragment_java",
     "//ui/android:ui_java",
   ]
-  android_manifest_for_lint = system_webview_android_manifest
-  min_sdk_version = 21
 }
 
 android_library("services_java") {
@@ -92,8 +90,6 @@ android_library("services_java") {
     "//components/variations/android:variations_java",
     "//components/version_info/android:version_constants_java",
   ]
-  android_manifest_for_lint = system_webview_android_manifest
-  min_sdk_version = 21
 }
 
 source_set("nonembedded") {

android_webview/tools/automated_ui_tests/BUILD.gn

@@ -29,8 +29,6 @@ android_library("webview_ui_test_app_java") {
     ":webview_ui_test_app_apk_resources",
     "//base:base_java",
   ]
-
-  android_manifest_for_lint = "java/AndroidManifest.xml"
 }
 
 android_resources("webview_ui_test_app_apk_resources") {

build/config/android/internal_rules.gni

@@ -3235,10 +3235,6 @@ if (enable_java_templates) {
   #    any other target that has requires_android.
   #  include_java_resources: Optional. If True, include Java (not Android)
   #    resources into final .jar file.
-  #  android_manifest_for_lint: Optional path to Android manifest to use
-  #    if Android linting is enabled. Ignored for 'android_apk' types
-  #    (since the value of android_manifest will be used instead).
-  #  lint_suppressions_file: Optional lint suppressions input file.
   #  jar_excluded_patterns: Optional list of .class file patterns to exclude
   #    from the final .jar file.
   #  jar_included_patterns: Optional list of .class file patterns to include
@@ -3604,13 +3600,6 @@ if (enable_java_templates) {
       _header_target_name = "${target_name}__header"
     }
 
-    # Temporary to avoid downstream breakage: https://crbug.com/1017190
-    not_needed(invoker,
-               [
-                 "min_sdk_version",
-                 "android_manifest_for_lint",
-               ])
-
     if (_has_sources) {
       if (defined(invoker.enable_errorprone)) {
         _enable_errorprone = invoker.enable_errorprone

build/config/android/rules.gni

@@ -1805,9 +1805,6 @@ if (enable_java_templates) {
   # resources.
   #
   # 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

@@ -509,8 +509,6 @@ android_library("chrome_java") {
     "//net:effective_connection_type_java",
   ]
 
-  android_manifest_for_lint = chrome_public_android_manifest
-
   # From java_sources.gni.
   sources = chrome_java_sources + [
               app_hooks_impl,
@@ -1815,7 +1813,6 @@ android_library("monochrome_java") {
   ]
   sources =
       [ "java/src/org/chromium/chrome/browser/MonochromeApplication.java" ]
-  min_sdk_version = 24
 }
 
 # Defines a target that derives from the monochrome public application. This

chrome/android/modules/chrome_bundle_tmpl.gni

@@ -74,7 +74,6 @@ template("chrome_bundle") {
   android_app_bundle(target_name) {
     forward_variables_from(invoker,
                            [
-                             "android_manifest_for_lint",
                              "base_module_target",
                              "bundle_name",
                              "compress_shared_libraries",

chrome/android/webapk/shell_apk/BUILD.gn

@@ -44,11 +44,7 @@ mustache_pass("generate_new_style_manifest_for_upload") {
 # name conflict.
 template("webapk_java") {
   android_library(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "android_manifest_for_lint",
-                             "deps",
-                           ])
+    forward_variables_from(invoker, [ "deps" ])
 
     sources = [
       "src/org/chromium/webapk/shell_apk/ChooseHostBrowserDialog.java",
@@ -75,24 +71,18 @@ template("webapk_java") {
       "//chrome/android/webapk/libs/common:common_java",
       "//chrome/android/webapk/libs/common:splash_java",
     ]
-    min_sdk_version = 21
   }
 }
 
 template("webapk_with_service_java") {
   android_library(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "android_manifest_for_lint",
-                             "deps",
-                           ])
+    forward_variables_from(invoker, [ "deps" ])
 
     sources = [
       "src/org/chromium/webapk/shell_apk/WebApkServiceFactory.java",
       "src/org/chromium/webapk/shell_apk/WebApkServiceImplWrapper.java",
     ]
     deps += [ ":compiled_in_runtime_library_java" ]
-    min_sdk_version = 21
   }
 }
 
@@ -228,7 +218,6 @@ template("webapk_tmpl") {
   }
 
   webapk_java(_java_without_services_target_name) {
-    android_manifest_for_lint = _manifest_output
     deps = [
       ":$_manifest_target_name",
       ":$_resources_target_name",
@@ -236,7 +225,6 @@ template("webapk_tmpl") {
   }
 
   webapk_with_service_java(_java_with_services_target_name) {
-    android_manifest_for_lint = _manifest_output
     deps = [
       ":$_java_without_services_target_name",
       ":$_manifest_target_name",

chromecast/browser/android/BUILD.gn

@@ -159,9 +159,6 @@ android_library("cast_shell_java") {
     "$java_src_dir/org/chromium/chromecast/shell/WebContentsRegistry.java",
   ]
 
-  android_manifest_for_lint = cast_shell_android_manifest
-  min_sdk_version = 21
-
   srcjar_deps = [
     ":cast_shell_build_config_gen",
     ":chromecast_product_config",

content/shell/android/BUILD.gn

@@ -101,7 +101,6 @@ android_library("content_shell_java") {
     "java/src/org/chromium/content_shell/ShellViewAndroidDelegate.java",
   ]
 
-  android_manifest_for_lint = content_shell_manifest
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 

content/test/BUILD.gn

@@ -819,7 +819,6 @@ if (is_android) {
       "//testing/android/native_test:native_test_java",
       "//ui/android:ui_java",
     ]
-    android_manifest_for_lint = content_browsertests_manifest
   }
 
   android_resources("content_browsertests_resources") {

remoting/android/client_java_tmpl.gni

@@ -112,8 +112,5 @@ template("remoting_android_client_java_tmpl") {
     if (defined(invoker.remoting_google_play_services_library)) {
       deps += [ invoker.remoting_google_play_services_library ]
     }
-
-    android_manifest_for_lint =
-        "$root_gen_dir/remoting/android/AndroidManifest.xml"
   }
 }

third_party/android_sdk/androidx_browser/BUILD.gn

@@ -49,7 +49,6 @@ android_library("androidx_browser_java") {
     "//third_party/android_deps:com_android_support_support_compat_java",
   ]
   srcjar_deps = [ ":androidx_browser_service_aidl" ]
-  android_manifest_for_lint = "src/browser/browser/src/main/AndroidManifest.xml"
   chromium_code = false
 }
 

weblayer/public/java/BUILD.gn

@@ -83,9 +83,6 @@ android_library("java") {
     "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",
     "//weblayer/browser/java:interfaces_java",
   ]
-
-  min_sdk_version = 21
-  android_manifest_for_lint = weblayer_client_manifest
 }
 
 dist_aar("client_aar") {

weblayer/test/BUILD.gn

@@ -48,8 +48,6 @@ if (is_android) {
     ]
 
     annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-
-    android_manifest_for_lint = weblayer_browsertests_manifest
   }
 
   generate_jni("weblayer_browsertests_jni") {