Adding option for Proguard jar to be switched.

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/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
@@ skipping 1260 matching lines @@
 #   include_all_resources - If true include all resource IDs in all generated
 #     R.java files.
 #   testonly: Marks this target as "test-only".
 #   write_asset_list: Adds an extra file to the assets, which contains a list of
 #     all other asset files.
 #   alternative_locale_resource_dep: The locale resource target which overrides
 #     any exsting locale resources in dep graph.
 #   requires_sdk_api_level_23: If defined and true, the apk is intended for
 #     installation only on Android M or later. In these releases the system
 #     linker does relocation unpacking, so we can enable it unconditionally.
-#   secondary_native_libs: the path of native libraries for secondary app abi.
+#   secondary_native_libs: The path of native libraries for secondary app abi.
 #   run_findbugs_override: Forces run_findbugs on or off. If undefined, the
 #     default will use the build arg run_findbugs.
+#   proguard_jar_path: The path to proguard.jar you wish to use. If undefined,
+#     the proguard used will be the checked in one in //third_party/proguard.
 #
 # Example
 #   android_apk("foo_apk") {
 #     android_manifest = "AndroidManifest.xml"
 #     java_files = [
 #       "android/org/chromium/foo/FooApplication.java",
 #       "android/org/chromium/foo/FooActivity.java",
 #     ]
 #     deps = [
 #       ":foo_support_java"
@@ skipping 136 matching lines @@
       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"
+    _proguard_output_jar_path = "$base_path.proguard.jar"
   }
 
   _emma_never_instrument = defined(invoker.testonly) && invoker.testonly
 
   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
@@ skipping 14 matching lines @@
       has_alternative_locale_resource = true
     }
 
     # Added emma to the target's classpath via its .build_config.
     if (emma_coverage && !_emma_never_instrument) {
       deps += [ "//third_party/android_tools:emma_device" ]
     }
 
     proguard_enabled = _proguard_enabled
     if (_proguard_enabled) {
-      proguard_info = "$_proguard_jar_path.info"
+      proguard_info = "$_proguard_output_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) {
@@ skipping 65 matching lines @@
     java_cpp_template("${_template_name}__build_config_java") {
       package_name = "org/chromium/base"
       sources = [
         "//base/android/java/templates/BuildConfig.template",
       ]
 
       defines = []
       if (enable_multidex) {
         defines += [ "ENABLE_MULTIDEX" ]
       }
+      if (is_java_debug) {
+        defines += [ "DEBUG" ]
+      }
     }
     _srcjar_deps += [ ":${_template_name}__build_config_java" ]
   }
 
   java_target = "${_template_name}__java"
   java_library_impl(java_target) {
     forward_variables_from(invoker,
                            [
                              "chromium_code",
                              "java_files",
@@ skipping 51 matching lines @@
     }
   }
 
   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) {
-      forward_variables_from(invoker, [ "alternative_android_sdk_jar" ])
+      forward_variables_from(invoker,
+                             [
+                               "alternative_android_sdk_jar",
+                               "proguard_jar_path",
+                             ])
       deps = [
         ":$build_config_target",
         ":$java_target",
         ":$process_resources_target",
       ]
       inputs = [
                  _build_config,
                  _jar_path,
                ] + _proguard_configs
 
-      output_jar_path = _proguard_jar_path
+      output_jar_path = _proguard_output_jar_path
       _rebased_proguard_configs = rebase_path(_proguard_configs, root_build_dir)
       args = [
         "--proguard-configs=$_rebased_proguard_configs",
         "--input-paths=@FileArg($_rebased_build_config:proguard:input_paths)",
       ]
       if (defined(invoker.apk_under_test)) {
         deps += [
           "${invoker.apk_under_test}__build_config",
           "${invoker.apk_under_test}__proguard",
         ]
         _apk_under_test_build_config =
             get_label_info(invoker.apk_under_test, "target_gen_dir") + "/" +
             get_label_info(invoker.apk_under_test, "name") + ".build_config"
         _rebased_apk_under_test_build_config =
             rebase_path(_apk_under_test_build_config, root_build_dir)
         args += [ "--tested-apk-info=@FileArg($_rebased_apk_under_test_build_config:deps_info:proguard_info)" ]
       }
     }
-    _dex_sources = [ _proguard_jar_path ]
+    _dex_sources = [ _proguard_output_jar_path ]
     _dex_deps = [ ":$_proguard_target" ]
   } else {
     if (enable_multidex) {
       _dex_sources = [ _jar_path ]
     } else {
       _dex_sources = [ _lib_dex_path ]
     }
     _dex_deps = [ ":$java_target" ]
   }
 
@@ skipping 794 matching lines @@
       "--target",
       rebase_path(invoker.target, root_build_dir),
       "--output-directory",
       rebase_path(root_out_dir, root_build_dir),
     ]
     if (defined(invoker.flag_name)) {
       args += [ "--flag-name=${invoker.flag_name}" ]
     }
   }
 }