diff options
| author | Ying Wang <wangying@google.com> | 2014-02-08 10:31:36 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-02-08 10:31:46 -0800 |
| commit | 960d919e814726f05ad1a9b82e6a9677f9977f15 (patch) | |
| tree | 6467a4fa91af2edee74930ba37ae77f94409ffdc /core/definitions.mk | |
| parent | a6e8c6c1e0f659b3532bd86631104360b54016ea (diff) | |
| parent | 4df82b3e30794a3652a5dda773a74f486fec3325 (diff) | |
| download | build-960d919e814726f05ad1a9b82e6a9677f9977f15.zip build-960d919e814726f05ad1a9b82e6a9677f9977f15.tar.gz build-960d919e814726f05ad1a9b82e6a9677f9977f15.tar.bz2 | |
resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp
Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6
Diffstat (limited to 'core/definitions.mk')
| -rw-r--r-- | core/definitions.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 7c29e30..9774a68 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1929,7 +1929,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 ########################################################### |