From 230dbfc98ddc7f8df09f4f2514d666518effc170 Mon Sep 17 00:00:00 2001 From: kapishnikov Date: Wed, 30 Nov 2016 14:54:59 -0800 Subject: [PATCH] [GN] Add support for generated proguard configs in android_apk BUG=669961 Review-Url: https://codereview.chromium.org/2541763003 Cr-Original-Commit-Position: refs/heads/master@{#435460} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 6130422db2a8ff2a08ab0cd2b19d861825c900ae --- config/android/rules.gni | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/android/rules.gni b/config/android/rules.gni index 49de6cb6f..89197fa41 100644 --- a/config/android/rules.gni +++ b/config/android/rules.gni @@ -1833,9 +1833,13 @@ if (enable_java_templates) { forward_variables_from(invoker, [ "alternative_android_sdk_jar", + "deps", "proguard_jar_path", ]) - deps = [ + if (!defined(deps)) { + deps = [] + } + deps += [ ":$build_config_target", ":$java_target", ":$process_resources_target",