Revert of GN: Enable proguard for apks

build/config/android/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("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 1333 matching lines @@
   _create_abi_split =
       defined(invoker.create_abi_split) && invoker.create_abi_split
   _create_density_splits =
       defined(invoker.create_density_splits) && invoker.create_density_splits
   _create_language_splits =
       defined(invoker.language_splits) && invoker.language_splits != []
 
   # Help GN understand that _create_abi_split is not unused (bug in GN).
   assert(_create_abi_split || true)
 
-  _proguard_enabled =
-      defined(invoker.proguard_enabled) && invoker.proguard_enabled
-  if (_proguard_enabled) {
-    _proguard_jar_path = "$base_path.proguard.jar"
-  }
-
   build_config_target = "${_template_name}__build_config"
   write_build_config(build_config_target) {
     forward_variables_from(invoker, [ "apk_under_test" ])
     type = "android_apk"
     jar_path = _jar_path
     dex_path = final_dex_path
     resources_zip = resources_zip_path
     build_config = _build_config
     android_manifest = _android_manifest
 
     deps = _chromium_linker_dep + _android_manifest_deps
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
 
-    proguard_enabled = _proguard_enabled
-    if (_proguard_enabled) {
-      proguard_info = "$_proguard_jar_path.info"
-    }
-
     native_libs = _native_libs
   }
 
   _final_deps = []
 
-  _generated_proguard_config = "$base_path.resources.proguard.txt"
   process_resources_target = "${_template_name}__process_resources"
   process_resources(process_resources_target) {
     forward_variables_from(invoker, [ "include_all_resources" ])
     srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
     r_text_path = "${target_gen_dir}/${target_name}_R.txt"
     android_manifest = _android_manifest
     resource_dirs = [ "//build/android/ant/empty/res" ]
     zip_path = resources_zip_path
     all_resources_zip_path = _all_resources_zip_path
     generate_constant_ids = true
-    proguard_file = _generated_proguard_config
 
     build_config = _build_config
     deps = _android_manifest_deps + [ ":$build_config_target" ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
   }
   _srcjar_deps += [ ":$process_resources_target" ]
 
   if (_native_libs != []) {
@@ skipping 92 matching lines @@
       inputs += [ _jar_path ]
       _rebased_jar_path = rebase_path([ _jar_path ], root_build_dir)
       args += [ "--inputs=$_rebased_jar_path" ]
       deps = [
         ":$build_config_target",  # Generates the build config file.
         ":$java_target",  # Generates the jar file.
       ]
     }
   }
 
-  if (_proguard_enabled) {
-    _proguard_configs = [ _generated_proguard_config ]
-    if (defined(invoker.proguard_configs)) {
-      _proguard_configs += invoker.proguard_configs
-    }
-    _proguard_target = "${_template_name}__proguard"
-    proguard(_proguard_target) {
-      deps = [
-        ":$build_config_target",
-        ":$process_resources_target",
-        ":$java_target",
-      ]
-      inputs = [
-                 _build_config,
-                 _jar_path,
-               ] + _proguard_configs
-
-      output_jar_path = _proguard_jar_path
-      rebased_proguard_configs = rebase_path(_proguard_configs, root_build_dir)
-      args = [
-        "--proguard-configs=$rebased_proguard_configs",
-        "--tested-apk-info=@FileArg($_rebased_build_config:proguard:tested_apk_info)",
-        "--input-paths=@FileArg($_rebased_build_config:proguard:input_paths)",
-      ]
-    }
-    _dex_sources = [ _proguard_jar_path ]
-    _dex_deps = [ ":$_proguard_target" ]
-  } else {
-    _dex_sources = [ _lib_dex_path ]
-    _dex_deps = [ ":$java_target" ]
-  }
-
   dex("$final_dex_target_name") {
-    deps = _dex_deps + [ ":$build_config_target" ]
+    deps = [
+      ":$build_config_target",
+      ":$java_target",
+    ]
     inputs = [
       _build_config,
     ]
-    sources = _dex_sources
     output = final_dex_path
     _dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
-    args = [ "--inputs=@FileArg($_dex_arg_key)" ]
+    args = [
+      "--inputs=@FileArg($_dex_arg_key)",
+      _rebased_lib_dex_path,
+    ]
   }
 
   if (_native_libs != []) {
     _prepare_native_target_name = "${_template_name}__prepare_native"
     action(_prepare_native_target_name) {
       forward_variables_from(invoker,
                              [
                                "data_deps",
                                "public_deps",
                              ])
@@ skipping 585 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }