Revert of GN: Enable proguard for apks

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/config/android/config.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
 
@@ skipping 56 matching lines @@
       "--processed-config-path",
       rebase_path(config_path, root_build_dir),
       "--result-path",
       rebase_path(result_path, root_build_dir),
       "--java-files=$rebased_java_files",
       "--enable",
     ]
   }
 }
 
-template("proguard") {
-  action(target_name) {
-    set_sources_assignment_filter([])
-    forward_variables_from(invoker,
-                           [
-                             "deps",
-                             "data_deps",
-                             "public_deps",
-                             "testonly",
-                           ])
-    script = "//build/android/gyp/proguard.py"
-    _proguard_jar_path = "//third_party/proguard/lib/proguard.jar"
-    _output_jar_path = invoker.output_jar_path
-    inputs = [
-      android_sdk_jar,
-      _proguard_jar_path,
-    ]
-    if (defined(invoker.inputs)) {
-      inputs += invoker.inputs
-    }
-    depfile = "${target_gen_dir}/${target_name}.d"
-    outputs = [
-      depfile,
-      _output_jar_path,
-      "$_output_jar_path.dump",
-      "$_output_jar_path.seeds",
-      "$_output_jar_path.mapping",
-      "$_output_jar_path.usage",
-    ]
-    args = [
-      "--depfile",
-      rebase_path(depfile, root_build_dir),
-      "--proguard-path",
-      rebase_path(_proguard_jar_path, root_build_dir),
-      "--output-path",
-      rebase_path(_output_jar_path, root_build_dir),
-      "--classpath",
-      rebased_android_sdk_jar,
-    ]
-    if (defined(invoker.args)) {
-      args += invoker.args
-    }
-  }
-}
-
 template("findbugs") {
   jar_path = invoker.jar_path
 
   build_config = invoker.build_config
 
   action(target_name) {
     forward_variables_from(invoker,
                            [
                              "deps",
                              "testonly",
@@ skipping 139 matching lines @@
 # Write the target's .build_config file. This is a json file that contains a
 # dictionary of information about how to build this target (things that
 # require knowledge about this target's dependencies and cannot be calculated
 # at gn-time). There is a special syntax to add a value in that dictionary to
 # an action/action_foreachs args:
 #   --python-arg=@FileArg($rebased_build_config_path:key0:key1)
 # At runtime, such an arg will be replaced by the value in the build_config.
 # See build/android/gyp/write_build_config.py and
 # build/android/gyp/util/build_utils.py:ExpandFileArgs
 template("write_build_config") {
+  set_sources_assignment_filter([])
+
+  assert(defined(invoker.type))
+  assert(defined(invoker.build_config))
+
+  type = invoker.type
+  build_config = invoker.build_config
+
+  assert(type == "android_apk" || type == "java_library" ||
+         type == "android_resources" || type == "deps_dex" ||
+         type == "android_assets" || type == "resource_rewriter")
+
   action(target_name) {
-    set_sources_assignment_filter([])
-    type = invoker.type
-    build_config = invoker.build_config
-
-    assert(type == "android_apk" || type == "java_library" ||
-           type == "android_resources" || type == "deps_dex" ||
-           type == "android_assets" || type == "resource_rewriter")
-
     deps = []
     forward_variables_from(invoker,
                            [
                              "deps",
                              "testonly",
                              "visibility",
                            ])
 
     script = "//build/android/gyp/write_build_config.py"
     depfile = "$target_gen_dir/$target_name.d"
@@ skipping 137 matching lines @@
     if (is_apk) {
       if (defined(invoker.native_libs)) {
         inputs += invoker.native_libs
         rebased_native_libs = rebase_path(invoker.native_libs, root_build_dir)
         rebased_android_readelf = rebase_path(android_readelf, root_build_dir)
         args += [
           "--native-libs=$rebased_native_libs",
           "--readelf-path=$rebased_android_readelf",
         ]
       }
-
-      if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) {
-        args += [
-          "--proguard-enabled",
-          "--proguard-info",
-          rebase_path(invoker.proguard_info, root_build_dir),
-        ]
-      }
     }
 
     if (defined(invoker.srcjar)) {
       args += [
         "--srcjar",
         rebase_path(invoker.srcjar, root_build_dir),
       ]
     }
   }
 }
 
 template("process_java_prebuilt") {
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
 
   _input_jar_path = invoker.input_jar_path
   _output_jar_path = invoker.output_jar_path
   _output_ijar_path = get_path_info(_output_jar_path, "dir") + "/" +
                       get_path_info(_output_jar_path, "name") + ".interface.jar"
 
   assert(invoker.build_config != "")
 
   if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
+    _proguard_jar_path = "//third_party/proguard/lib/proguard.jar"
+    _proguard_config_path = invoker.proguard_config
     _build_config = invoker.build_config
     _rebased_build_config = rebase_path(_build_config, root_build_dir)
-    _proguard_config_path = invoker.proguard_config
     _output_jar_target = "${target_name}__proguard_process"
-    proguard(_output_jar_target) {
+    action(_output_jar_target) {
       forward_variables_from(invoker,
                              [
                                "data_deps",
                                "deps",
                                "public_deps",
                              ])
+      script = "//build/android/gyp/proguard.py"
       inputs = [
+        android_sdk_jar,
+        _proguard_jar_path,
         _build_config,
         _input_jar_path,
         _proguard_config_path,
       ]
-      output_jar_path = _output_jar_path
-      _rebased_input_paths = [ rebase_path(_input_jar_path, root_build_dir) ]
-      _rebased_proguard_configs =
-          [ rebase_path(_proguard_config_path, root_build_dir) ]
+      depfile = "${target_gen_dir}/${target_name}.d"
+      outputs = [
+        depfile,
+        _output_jar_path,
+      ]
       args = [
-        "--input-paths=$_rebased_input_paths",
-        "--proguard-configs=$_rebased_proguard_configs",
+        "--depfile",
+        rebase_path(depfile, root_build_dir),
+        "--proguard-path",
+        rebase_path(_proguard_jar_path, root_build_dir),
+        "--input-path",
+        rebase_path(_input_jar_path, root_build_dir),
+        "--output-path",
+        rebase_path(_output_jar_path, root_build_dir),
+        "--proguard-config",
+        rebase_path(_proguard_config_path, root_build_dir),
+        "--classpath",
+        rebased_android_sdk_jar,
         "--classpath=@FileArg($_rebased_build_config:javac:classpath)",
       ]
     }
   } else {
     _output_jar_target = "${target_name}__copy_jar"
     copy(_output_jar_target) {
       forward_variables_from(invoker,
                              [
                                "data_deps",
                                "deps",
@@ skipping 1056 matching lines @@
 
     if (defined(invoker.all_resources_zip_path)) {
       all_resources_zip = invoker.all_resources_zip_path
       outputs += [ all_resources_zip ]
       args += [
         "--all-resources-zip-out",
         rebase_path(all_resources_zip, root_build_dir),
       ]
     }
 
-    if (defined(invoker.proguard_file)) {
-      outputs += [ invoker.proguard_file ]
-      args += [
-        "--proguard-file",
-        rebase_path(invoker.proguard_file, root_build_dir),
-      ]
-    }
-
     if (defined(invoker.args)) {
       args += invoker.args
     }
   }
 }
 
 template("copy_ex") {
   set_sources_assignment_filter([])
   action(target_name) {
     inputs = []
@@ skipping 188 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }