diff options
| author | Ying Wang <wangying@google.com> | 2014-02-10 12:51:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-10 12:51:36 +0000 |
| commit | a87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0 (patch) | |
| tree | 907d7e878b11a0445f49687dc839f8adeb374d8b /core/java.mk | |
| parent | 2ad7d4df0746e7e16fd3cc39d14fa352801abcae (diff) | |
| parent | 74b71317711fe4bacc6422e45de599fea840f061 (diff) | |
| download | build-a87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0.zip build-a87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0.tar.gz build-a87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0.tar.bz2 | |
am 74b71317: am 2d72094f: am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp
* commit '74b71317711fe4bacc6422e45de599fea840f061':
Allow proguarding the main app and the test app in a single run.
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java.mk b/core/java.mk index fc30d3c..824ae6a 100644 --- a/core/java.mk +++ b/core/java.mk @@ -440,8 +440,14 @@ endif # LOCAL_PROGUARD_ENABLED is not nosystem proguard_flag_files := $(addprefix $(LOCAL_PATH)/, $(LOCAL_PROGUARD_FLAG_FILES)) LOCAL_PROGUARD_FLAGS += $(addprefix -include , $(proguard_flag_files)) +ifdef LOCAL_TEST_MODULE_TO_PROGUARD_WITH +extra_input_jar := $(call intermediates-dir-for,APPS,$(LOCAL_TEST_MODULE_TO_PROGUARD_WITH),,COMMON)/classes.jar +else +extra_input_jar := +endif +$(full_classes_proguard_jar): PRIVATE_EXTRA_INPUT_JAR := $(extra_input_jar) $(full_classes_proguard_jar): PRIVATE_PROGUARD_FLAGS := $(proguard_flags) $(LOCAL_PROGUARD_FLAGS) -$(full_classes_proguard_jar) : $(full_classes_jar) $(proguard_flag_files) | $(ACP) $(PROGUARD) +$(full_classes_proguard_jar) : $(full_classes_jar) $(extra_input_jar) $(proguard_flag_files) | $(ACP) $(PROGUARD) $(call transform-jar-to-proguard) else # LOCAL_PROGUARD_ENABLED not defined |