Android: Delete proguard_preprocess logic

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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build_overrides/build.gni")
 import("//build/config/android/config.gni")
 import("//build/config/dcheck_always_on.gni")
 import("//build/config/sanitizers/sanitizers.gni")
@@ skipping 1024 matching lines @@
     _output_jar_path = invoker.output_jar_path
 
     _jar_excluded_patterns = []
     if (defined(invoker.jar_excluded_patterns)) {
       _jar_excluded_patterns = invoker.jar_excluded_patterns
     }
     _strip_resource_classes = defined(invoker.strip_resource_classes) &&
                               invoker.strip_resource_classes
     _filter_jar = _jar_excluded_patterns != [] || _strip_resource_classes
 
-    _proguard_preprocess =
-        defined(invoker.proguard_preprocess) && invoker.proguard_preprocess
-
     _enable_assert =
         defined(invoker.supports_android) && invoker.supports_android &&
         (is_java_debug || dcheck_always_on)
 
     _retrolambda = defined(invoker.supports_android) &&
                    invoker.supports_android && use_java8
 
     _deps = []
     _previous_output_jar = _input_jar_path
 
@@ skipping 28 matching lines @@
         if (_strip_resource_classes) {
           args += [ "--strip-resource-classes-for=@FileArg($_rebased_build_config:javac:resource_packages)" ]
         }
       }
 
       _deps = []
       _deps = [ ":$_filter_target" ]
       _previous_output_jar = _filter_output_jar
     }
 
-    if (_proguard_preprocess) {
-      _proguard_target = "${target_name}__proguard_process"
-      _proguard_input_jar = _previous_output_jar
-      _proguard_output_jar = "$target_out_dir/$target_name-proguarded.jar"
-      _proguard_config_path = invoker.proguard_preprocess_config
-
-      proguard(_proguard_target) {
-        deps = _deps
-        if (defined(invoker.deps)) {
-          deps += invoker.deps
-        }
-        if (defined(invoker.public_deps)) {
-          public_deps = invoker.public_deps
-        }
-        inputs = [
-          _build_config,
-          _proguard_config_path,
-          _proguard_input_jar,
-        ]
-        output_jar_path = _proguard_output_jar
-
-        _rebased_input_paths =
-            [ rebase_path(_proguard_input_jar, root_build_dir) ]
-        _rebased_proguard_configs =
-            [ rebase_path(_proguard_config_path, root_build_dir) ]
-        args = [
-          "--input-paths=$_rebased_input_paths",
-          "--proguard-configs=$_rebased_proguard_configs",
-          "--classpath=@FileArg($_rebased_build_config:javac:classpath)",
-        ]
-      }
-
-      _deps = []
-      _deps = [ ":$_proguard_target" ]
-      _previous_output_jar = _proguard_output_jar
-    }
-
     if (_enable_assert) {
       _assert_target = "${target_name}__assert"
       _assert_input_jar = _previous_output_jar
       _assert_output_jar = "$target_out_dir/$target_name-asserted.jar"
 
       action(_assert_target) {
         script = "$root_build_dir/bin/helper/java_assertion_enabler"
         deps = [
           "//build/android/java_assertion_enabler($default_toolchain)",
         ]
@@ skipping 739 matching lines @@
         # Use original jar_path because _jar_path points to a library without
         # resources.
         java_resources_jar = invoker.jar_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" ]
       }
 
       supports_android = _supports_android
       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) {
-      if (!defined(invoker.proguard_preprocess) ||
-          !invoker.proguard_preprocess) {
-        # Always used the unfiltered .jar to create the interface jar so that
-        # other targets will resolve filtered classes when depending on
-        # BuildConfig, NativeLibraries, etc.
-        input_jar = invoker.jar_path
-        deps = _deps + _jar_deps
-      } else {
-        # However, still apply pre-proguarding, since ignoring that can break
-        # compiles.
-        input_jar = _jar_path
-        deps = [
-          ":$_process_jar_target_name",
-        ]
-      }
-
+      # Always used the unfiltered .jar to create the interface jar so that
+      # other targets will resolve filtered classes when depending on
+      # BuildConfig, NativeLibraries, etc.
+      input_jar = invoker.jar_path
+      deps = _deps + _jar_deps
       output_jar = _ijar_path
     }
 
     if (_supports_android) {
       dex(_dex_target_name) {
         sources = [
           _jar_path,
         ]
         output = _dex_path
         deps = [ ":$_process_jar_target_name" ] + _deps + _jar_deps
@@ skipping 243 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",
-                               "proguard_preprocess",
-                               "proguard_preprocess_config",
-                             ])
+      forward_variables_from(invoker, [ "jar_excluded_patterns" ])
       supports_android = _supports_android
       build_config = _build_config
       input_jar_path = _javac_jar_path
       output_jar_path = _process_prebuilt_jar_path
 
       deps = [
         ":$_javac_target_name",
       ]
       if (defined(invoker.deps)) {
         deps += invoker.deps
@@ skipping 13 matching lines @@
         output_jar_path = _final_jar_path
 
         if (!defined(deps)) {
           deps = []
         }
         deps += [ ":$_process_prebuilt_target_name" ]
       }
     }
 
     generate_interface_jar(_ijar_target_name) {
-      if (!defined(invoker.proguard_preprocess) ||
-          !invoker.proguard_preprocess) {
-        # Always used the unfiltered .jar to create the interface jar so that
-        # other targets will resolve filtered classes when depending on
-        # BuildConfig, NativeLibraries, etc.
-        input_jar = _javac_jar_path
-        deps = [
-          ":$_javac_target_name",
-        ]
-      } else {
-        # However, still apply pre-proguarding, since ignoring that can break
-        # compiles.
-        input_jar = _process_prebuilt_jar_path
-        deps = [
-          ":$_process_prebuilt_target_name",
-        ]
-      }
+      # Always used the unfiltered .jar to create the interface jar so that
+      # other targets will resolve filtered classes when depending on
+      # BuildConfig, NativeLibraries, etc.
+      input_jar = _javac_jar_path
+      deps = [
+        ":$_javac_target_name",
+      ]
       output_jar = _final_ijar_path
     }
 
     group(_final_target_name) {
       forward_variables_from(invoker, [ "visibility" ])
       public_deps = [
         ":$_ijar_target_name",
       ]
       if (_emma_instrument) {
         public_deps += [ ":$_emma_instr_target_name" ]
@@ skipping 175 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_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
       srcjars = _srcjars
@@ skipping 381 matching lines @@
         rebase_path(root_build_dir, root_build_dir),
         "--packed-libraries-dir",
         rebase_path(_packed_libraries_dir, root_build_dir),
         "--libraries=${invoker.libraries_filearg}",
         "--filelistjson",
         rebase_path(invoker.file_list_json, root_build_dir),
       ]
     }
   }
 }