Android: Remove unnecessary manifest_package

Lint no longer requires manifest_package to be specified, so remove this
arg from lint.py as well as the gn templates.

Bug: 1108791
Change-Id: I4b48dc1ce3eb40ef8b4e703ca4ece475f2d28c4b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339929
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796425}

build/android/gyp/lint.py

@@ -98,10 +98,8 @@ def _GenerateProjectFile(android_manifest,
   return project
 
 
-def _GenerateAndroidManifest(original_manifest_path,
-                             min_sdk_version,
-                             manifest_package=None):
-  # Set minSdkVersion and package in the manifest to the correct values.
+def _GenerateAndroidManifest(original_manifest_path, min_sdk_version):
+  # Set minSdkVersion in the manifest to the correct value.
   doc, manifest, _ = manifest_utils.ParseManifest(original_manifest_path)
   uses_sdk = manifest.find('./uses-sdk')
   if uses_sdk is None:
@@ -109,8 +107,6 @@ def _GenerateAndroidManifest(original_manifest_path,
     manifest.insert(0, uses_sdk)
   uses_sdk.set('{%s}minSdkVersion' % manifest_utils.ANDROID_NAMESPACE,
                min_sdk_version)
-  if manifest_package:
-    manifest.set('package', manifest_package)
   return doc
 
 
@@ -133,7 +129,6 @@ def _RunLint(lint_binary_path,
              android_sdk_version,
              srcjars,
              min_sdk_version,
-             manifest_package,
              resource_sources,
              resource_zips,
              android_sdk_root,
@@ -166,8 +161,7 @@ def _RunLint(lint_binary_path,
 
   logging.info('Generating Android manifest file')
   android_manifest_tree = _GenerateAndroidManifest(manifest_path,
-                                                   min_sdk_version,
-                                                   manifest_package)
+                                                   min_sdk_version)
   # Include the rebased manifest_path in the lint generated path so that it is
   # clear in error messages where the original AndroidManifest.xml came from.
   lint_android_manifest_path = os.path.join(lint_gen_dir,
@@ -282,8 +276,6 @@ def _ParseArgs(argv):
                       help='If set, some checks like UnusedResources will be '
                       'disabled since they are not helpful for test '
                       'targets.')
-  parser.add_argument('--manifest-package',
-                      help='Package name of the AndroidManifest.xml.')
   parser.add_argument('--warnings-as-errors',
                       action='store_true',
                       help='Treat all warnings as errors.')
@@ -347,7 +339,6 @@ def main():
            args.android_sdk_version,
            args.srcjars,
            args.min_sdk_version,
-           args.manifest_package,
            resource_sources,
            args.resource_zips,
            args.android_sdk_root,

build/config/android/rules.gni

@@ -3333,7 +3333,6 @@ if (enable_java_templates) {
                                  "lint_baseline_file",
                                  "lint_suppressions_dep",
                                  "lint_suppressions_file",
-                                 "manifest_package",
                                  "min_sdk_version",
                                ])
         if (defined(invoker.lint_min_sdk_version)) {
@@ -3344,10 +3343,8 @@ if (enable_java_templates) {
         deps = [ ":$_java_target" ]
       }
     } else {
-      # TODO(wnwen): Remove manifest_package when all usages are removed.
       not_needed(invoker,
                  [
-                   "manifest_package",
                    "lint_baseline_file",
                    "lint_min_sdk_version",
                  ])
@@ -5002,7 +4999,6 @@ if (enable_java_templates) {
                                  "lint_baseline_file",
                                  "lint_suppressions_dep",
                                  "lint_suppressions_file",
-                                 "manifest_package",
                                  "min_sdk_version",
                                ])
         if (defined(invoker.lint_min_sdk_version)) {
@@ -5013,10 +5009,8 @@ if (enable_java_templates) {
         deps = _module_java_targets
       }
     } else {
-      # TODO(wnwen): Remove manifest_package when all usages are removed.
       not_needed(invoker,
                  [
-                   "manifest_package",
                    "lint_baseline_file",
                    "lint_min_sdk_version",
                  ])

chrome/android/modules/chrome_bundle_tmpl.gni

@@ -88,7 +88,6 @@ template("chrome_bundle") {
                              "lint_min_sdk_version",
                              "lint_suppressions_dep",
                              "lint_suppressions_file",
-                             "manifest_package",
                              "min_sdk_version",
                              "proguard_android_sdk_dep",
                              "sign_bundle",