summaryrefslogtreecommitdiffstats
path: root/core/definitions.mk
diff options
context:
space:
mode:
authorMihail Dumitrescu <mdumitrescu@google.com>2014-02-07 15:18:59 +0000
committerMihail Dumitrescu <mdumitrescu@google.com>2014-02-07 19:11:24 +0000
commit4df82b3e30794a3652a5dda773a74f486fec3325 (patch)
tree50fda09df65564d96a81083e1709ac6261535661 /core/definitions.mk
parentf72e1846898ec07cedf301ac76875cfa9f1164bc (diff)
downloadbuild-4df82b3e30794a3652a5dda773a74f486fec3325.zip
build-4df82b3e30794a3652a5dda773a74f486fec3325.tar.gz
build-4df82b3e30794a3652a5dda773a74f486fec3325.tar.bz2
Allow proguarding the main app and the test app in a single run.
Bug: 12895101 Change-Id: I6804d73306a164d3e3ec0cab4743f9582b5ef2cf
Diffstat (limited to 'core/definitions.mk')
-rw-r--r--core/definitions.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/definitions.mk b/core/definitions.mk
index e1eb9f1..9a4a274 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1884,7 +1884,8 @@ endif
###########################################################
define transform-jar-to-proguard
@echo Proguard: $@
-$(hide) $(PROGUARD) -injars $< -outjars $@ $(PRIVATE_PROGUARD_FLAGS)
+$(hide) $(PROGUARD) -injars $< -outjars $@ $(PRIVATE_PROGUARD_FLAGS) \
+ $(addprefix -injars , $(PRIVATE_EXTRA_INPUT_JAR))
endef
###########################################################