🔏 Rename proguard_config -> proguard_preprocess_config

build/config/android/internal_rules.gni

 # Copyright 2014 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.
 
 import("//build_overrides/build.gni")
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
 assert(is_android)
 
@@ skipping 1057 matching lines @@
           rebase_path(_filtered_jar_path, root_build_dir),
           "--excluded-classes=$_jar_excluded_patterns",
         ]
         if (_strip_resource_classes) {
           args += [ "--strip-resource-classes-for=@FileArg($_rebased_build_config:javac:resource_packages)" ]
         }
       }
     }
 
     if (_proguard_preprocess) {
-      _proguard_config_path = invoker.proguard_config
+      _proguard_config_path = invoker.proguard_preprocess_config
       proguard(_proguard_target) {
         if (_filter_jar) {
           _proguard_input_jar = _filtered_jar_path
           public_deps = [
             ":$_filter_target",
           ]
         } else {
           _proguard_input_jar = _input_jar_path
           public_deps = []
         }
@@ skipping 689 matching lines @@
       jar_path = _jar_path
       if (_supports_android) {
         dex_path = _dex_path
       }
     }
 
     process_java_prebuilt(_process_jar_target_name) {
       forward_variables_from(invoker,
                              [
                                "jar_excluded_patterns",
+                               "proguard_preprocess",
+                               "proguard_preprocess_config",
                                "strip_resource_classes",
                              ])
 
       visibility = [
         ":$_ijar_target_name",
         ":$_template_name",
       ]
       if (_supports_android) {
         visibility += [ ":$_dex_target_name" ]
       }
 
-      if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
-        proguard_preprocess = true
-        proguard_config = invoker.proguard_config
+      # TODO(agrieve): Delete proguard_config once all usages are move to
+      #     proguard_preprocess_config.
+      if (defined(invoker.proguard_config)) {
+        proguard_preprocess_config = invoker.proguard_config
       }
 
       build_config = _build_config
       input_jar_path = invoker.jar_path
       output_jar_path = _jar_path
 
       deps = [ ":$_build_config_target_name" ] + _deps + _jar_deps
     }
 
     generate_interface_jar(_ijar_target_name) {
@@ skipping 256 matching lines @@
         inputs += [ file_tuple[0] ]
         args +=
             [ "--additional-jar-file=" + file_tuple[0] + ":" + file_tuple[1] ]
       }
       if (invoker.java_files != []) {
         args += [ "@" + rebase_path(invoker.java_sources_file, root_build_dir) ]
       }
     }
 
     process_java_prebuilt(_process_prebuilt_target_name) {
-      forward_variables_from(invoker, [ "jar_excluded_patterns" ])
+      forward_variables_from(invoker,
+                             [
+                               "jar_excluded_patterns",
+                               "proguard_preprocess",
+                               "proguard_preprocess_config",
+                             ])
       build_config = _build_config
       input_jar_path = _javac_jar_path
       output_jar_path = _process_prebuilt_jar_path
-      if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
-        proguard_preprocess = invoker.proguard_preprocess
-        proguard_config = invoker.proguard_config
+
+      # TODO(agrieve): Delete proguard_config once all usages are move to
+      #     proguard_preprocess_config.
+      if (defined(invoker.proguard_config)) {
+        proguard_preprocess_config = invoker.proguard_config
       }
       deps = [
         ":$_javac_target_name",
       ]
       if (defined(invoker.deps)) {
         deps += invoker.deps
       }
     }
 
     if (_emma_instrument) {
@@ skipping 195 matching lines @@
                                "additional_jar_files",
                                "alternative_android_sdk_ijar",
                                "alternative_android_sdk_ijar_dep",
                                "dist_jar_path",
                                "enable_errorprone",
                                "enable_incremental_javac_override",
                                "jar_excluded_patterns",
                                "manifest_entries",
                                "processors_javac",
                                "processor_args_javac",
-                               "proguard_config",
+                               "proguard_preprocess_config",
                                "proguard_preprocess",
                                "provider_configurations",
                              ])
       jar_path = _jar_path
       build_config = _build_config
       java_files = _java_files
       if (_java_files != []) {
         java_sources_file = _java_sources_file
       }
       srcjar_deps = _srcjar_deps
@@ skipping 324 matching lines @@
       outputs = [
         depfile,
         invoker.out_manifest,
       ]
       inputs = [
         invoker.main_manifest,
       ]
     }
   }
 }