🔔 Allow android_* targets to specify proguard flags 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("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/dcheck_always_on.gni")
 import("//build/toolchain/toolchain.gni")
 
 assert(is_android)
@@ skipping 1153 matching lines @@
   #   enable_errorprone: If true, enables the errorprone compiler.
   #   enable_incremental_javac_override: Overrides the global
   #     enable_incremental_javac.
   #
   #   jar_excluded_patterns: List of patterns of .class files to exclude from the
   #     final jar.
   #
   #   proguard_preprocess: If true, proguard preprocessing will be run. This can
   #     be used to remove unwanted parts of the library.
   #   proguard_preprocess_config: Path to the proguard config for preprocessing.
+  #   proguard_configs: List of proguard configs to use in final apk step for
+  #     any apk that depends on this library.
   #
   #   supports_android: If true, Android targets (android_library, android_apk)
   #     may depend on this target. Note: if true, this target must only use the
   #     subset of Java available on Android.
   #   bypass_platform_checks: Disables checks about cross-platform (Java/Android)
   #     dependencies for this target. This will allow depending on an
   #     android_library target, for example.
   #
   #   additional_jar_files: Use to package additional files into the output jar.
   #     Pass a list of length-2 lists with format
@@ skipping 29 matching lines @@
   # Declare a java library target for a prebuilt jar
   #
   # Variables
   #   deps: Specifies the dependencies of this target. Java targets in this list
   #     will be added to the javac classpath.
   #   jar_path: Path to the prebuilt jar.
   #   jar_dep: Target that builds jar_path (optional).
   #   proguard_preprocess: If true, proguard preprocessing will be run. This can
   #     be used to remove unwanted parts of the library.
   #   proguard_preprocess_config: Path to the proguard config for preprocessing.
+  #   proguard_configs: List of proguard configs to use in final apk step for
+  #     any apk that depends on this library.
   #   supports_android: If true, Android targets (android_library, android_apk)
   #     may depend on this target. Note: if true, this target must only use the
   #     subset of Java available on Android.
   #
   # Example
   #   java_prebuilt("foo_java") {
   #     jar_path = "foo.jar"
   #     deps = [
   #       ":foo_resources",
   #       ":bar_java"
@@ skipping 30 matching lines @@
   #   enable_errorprone: If true, enables the errorprone compiler.
   #   enable_incremental_javac_override: Overrides the global
   #     enable_incremental_javac.
   #
   #   jar_excluded_patterns: List of patterns of .class files to exclude from the
   #     final jar.
   #
   #   proguard_preprocess: If true, proguard preprocessing will be run. This can
   #     be used to remove unwanted parts of the library.
   #   proguard_preprocess_config: Path to the proguard config for preprocessing.
+  #   proguard_configs: List of proguard configs to use in final apk step for
+  #     any apk that depends on this library.
   #
   #   dex_path: If set, the resulting .dex.jar file will be placed under this
   #     path.
   #
   #   alternative_android_sdk_ijar: if set, the given android_sdk_ijar file
   #     replaces the default android_sdk_ijar.
   #
   #   alternative_android_sdk_ijar_dep: the target that generates
   #      alternative_android_sdk_ijar, must be set if alternative_android_sdk_ijar
   #      is used.
@@ skipping 69 matching lines @@
   # resources.
   #
   # Variables
   #   deps: Specifies the dependencies of this target. Java targets in this list
   #     will be added to the javac classpath. Android resources in dependencies
   #     will be used when building this library.
   #   jar_path: Path to the prebuilt jar.
   #   proguard_preprocess: If true, proguard preprocessing will be run. This can
   #     be used to remove unwanted parts of the library.
   #   proguard_preprocess_config: Path to the proguard config for preprocessing.
+  #   proguard_configs: List of proguard configs to use in final apk step for
+  #     any apk that depends on this library.
   #
   # Example
   #   android_java_prebuilt("foo_java") {
   #     jar_path = "foo.jar"
   #     deps = [
   #       ":foo_resources",
   #       ":bar_java"
   #     ]
   #   }
   template("android_java_prebuilt") {
@@ skipping 483 matching lines @@
         inputs = [
                    _build_config,
                    _jar_path,
                  ] + _proguard_configs
 
         output_jar_path = _proguard_output_jar_path
         _rebased_proguard_configs =
             rebase_path(_proguard_configs, root_build_dir)
         args = [
           "--proguard-configs=$_rebased_proguard_configs",
+          "--proguard-configs=@FileArg($_rebased_build_config:proguard:lib_configs)",
           "--input-paths=@FileArg($_rebased_build_config:proguard:input_paths)",
           "--classpath=@FileArg($_rebased_build_config:proguard:lib_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") + "/" +
@@ skipping 713 matching lines @@
   }
 
   # Declare an Android library target for a prebuilt AAR.
   #
   # This target creates an Android library containing java code and Android
   # resources. For libraries without resources, it will not generate
   # corresponding android_resources targets.
   #
   # Variables
   #   aar_path: Path to the AAR.
+  #   proguard_configs: List of proguard configs to use in final apk step for
+  #     any apk that depends on this library.
   #   TODO(jbudorick@): remove this arguments after crbug.com/522043 is fixed.
   #   requires_android: Whether this target can only be used for compiling Android related targets.
   #
   # Example
   #   android_aar_prebuilt("foo_java") {
   #     aar_path = "foo.aar"
   #   }
   template("android_aar_prebuilt") {
     assert(defined(invoker.aar_path))
     _output_path = "${target_gen_dir}/${target_name}"
@@ skipping 66 matching lines @@
     _counter = 0
     foreach(jar, _scanned_files.jars) {
       _counter += 1
       _current_target = "${target_name}__jar_$_counter"
       _jar_targets += [ ":$_current_target" ]
       java_prebuilt(_current_target) {
         forward_variables_from(invoker,
                                [
                                  "deps",
                                  "input_jars_paths",
+                                 "jar_excluded_patterns",
+                                 "proguard_configs",
                                  "requires_android",
-                                 "jar_excluded_patterns",
                                ])
         if (!defined(deps)) {
           deps = []
         }
         deps += _resource_targets + [ ":$_unpack_target_name" ]
         if (!defined(requires_android)) {
           requires_android = true
         }
         supports_android = true
         jar_path = "${_output_path}/$jar"
       }
     }
 
     java_group(target_name) {
       deps = _resource_targets + _jar_targets
     }
   }
 }