Android: Delete unused proguard.py flag "--proguard-config-exclusions"

Change-Id: I4e275a5cc27460a2d6b66c10f486c8f5d0636626
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1778589
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692215}

build/android/gyp/proguard.py

@@ -65,9 +65,6 @@ def _ParseOptions():
       action='append',
       required=True,
       help='GN-list of configuration files.')
-  parser.add_argument(
-      '--proguard-config-exclusions',
-      help='GN-list of paths to filter out of --proguard-configs')
   parser.add_argument(
       '--apply-mapping', help='Path to ProGuard mapping to apply.')
   parser.add_argument(
@@ -122,8 +119,6 @@ def _ParseOptions():
 
   options.classpath = build_utils.ParseGnList(options.classpath)
   options.proguard_configs = build_utils.ParseGnList(options.proguard_configs)
-  options.proguard_config_exclusions = (build_utils.ParseGnList(
-      options.proguard_config_exclusions))
   options.input_paths = build_utils.ParseGnList(options.input_paths)
   options.extra_mapping_output_paths = build_utils.ParseGnList(
       options.extra_mapping_output_paths)
@@ -357,18 +352,12 @@ def main():
 
   _VerifyNoEmbeddedConfigs(options.input_paths + libraries)
 
-  # Apply config exclusion filter.
-  config_paths = [
-      p for p in options.proguard_configs
-      if p not in options.proguard_config_exclusions
-  ]
-
   # ProGuard configs that are derived from flags.
   dynamic_config_data = _CreateDynamicConfig(options)
 
   # ProGuard configs that are derived from flags.
   merged_configs = _CombineConfigs(
-      config_paths, dynamic_config_data, exclude_generated=True)
+      options.proguard_configs, dynamic_config_data, exclude_generated=True)
   print_stdout = '-whyareyoukeeping' in merged_configs or options.verbose
 
   # Writing the config output before we know ProGuard is going to succeed isn't
@@ -386,11 +375,11 @@ def main():
                              options.verify_expected_configs)
 
   if options.r8_path:
-    _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data,
-                    print_stdout)
+    _OptimizeWithR8(options, options.proguard_configs, libraries,
+                    dynamic_config_data, print_stdout)
   else:
-    _OptimizeWithProguard(options, config_paths, libraries, dynamic_config_data,
-                          print_stdout)
+    _OptimizeWithProguard(options, options.proguard_configs, libraries,
+                          dynamic_config_data, print_stdout)
 
   # After ProGuard / R8 has run:
   for output in options.extra_mapping_output_paths:

build/config/android/internal_rules.gni

@@ -1172,13 +1172,6 @@ if (enable_java_templates) {
           "--proguard-configs=@FileArg($_rebased_build_config:deps_info:proguard_all_configs)",
           "--input-paths=@FileArg($_rebased_build_config:deps_info:java_runtime_classpath)",
         ]
-        if (defined(invoker.proguard_config_exclusions)) {
-          _rebased_proguard_config_exclusions =
-              rebase_path(invoker.proguard_config_exclusions, root_build_dir)
-          args += [
-            "--proguard-config-exclusions=$_rebased_proguard_config_exclusions",
-          ]
-        }
         if (defined(invoker.proguard_args)) {
           args += invoker.proguard_args
         }