From 4df82b3e30794a3652a5dda773a74f486fec3325 Mon Sep 17 00:00:00 2001
From: Mihail Dumitrescu <mdumitrescu@google.com>
Date: Fri, 7 Feb 2014 15:18:59 +0000
Subject: Allow proguarding the main app and the test app in a single run.

Bug: 12895101
Change-Id: I6804d73306a164d3e3ec0cab4743f9582b5ef2cf
---
 core/definitions.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'core/definitions.mk')

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
 
 ###########################################################
-- 
cgit v1.1