Index: build/config/android/rules.gni |
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni |
index 35be87bd3d76bd25c55bcf65a4b5c27264f05b10..df4daca525cc06c9d978b2978c36fe22312a56ad 100644 |
--- a/build/config/android/rules.gni |
+++ b/build/config/android/rules.gni |
@@ -1837,23 +1837,13 @@ if (enable_java_templates) { |
"alternative_android_sdk_jar", |
"proguard_jar_path", |
]) |
+ args = [] |
deps = [ |
":$build_config_target", |
":$java_target", |
":$process_resources_target", |
] |
- 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", |
- "--input-paths=@FileArg($_rebased_build_config:proguard:input_paths)", |
- ] |
if (defined(invoker.apk_under_test)) { |
deps += [ |
"${invoker.apk_under_test}__build_config", |
@@ -1865,7 +1855,24 @@ if (enable_java_templates) { |
_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)" ] |
+ _proguard_configs += [ |
+ "//testing/android/proguard_for_tests.flags", |
+ "//base/android/base_proguard_config.flags", |
+ ] |
} |
+ |
+ 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", |
+ "--input-paths=@FileArg($_rebased_build_config:proguard:input_paths)", |
+ ] |
} |
_dex_sources = [ _proguard_output_jar_path ] |
_dex_deps = [ ":$_proguard_target" ] |