diff options
| author | Ying Wang <wangying@google.com> | 2013-03-26 12:42:32 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-03-26 14:05:10 -0700 |
| commit | ba71aba939dc58a3278646039337f13d17e65ef2 (patch) | |
| tree | 751e535e5116260db9761e97ae3db185caebac8f /core/java_library.mk | |
| parent | 68b1d3b077af7561934a16f3d7e1accf461870cf (diff) | |
| download | build-ba71aba939dc58a3278646039337f13d17e65ef2.zip build-ba71aba939dc58a3278646039337f13d17e65ef2.tar.gz build-ba71aba939dc58a3278646039337f13d17e65ef2.tar.bz2 | |
Allow to run Proguard on static Java library
1. Let aapt output the proguard_options file
2. If proguard is enabled, switch the dependency from
$(full_classes_jar) to $(full_classes_proguard_jar).
Change-Id: Idc641a1515b8899a4623a2aeec5cd494f6c1c1c5
Diffstat (limited to 'core/java_library.mk')
| -rw-r--r-- | core/java_library.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/core/java_library.mk b/core/java_library.mk index d65a3ca..67c1bcb 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -31,6 +31,10 @@ intermediates.COMMON := $(call local-intermediates-dir,COMMON) common_javalib.jar := $(intermediates.COMMON)/$(LOCAL_BUILT_MODULE_STEM) LOCAL_INTERMEDIATE_TARGETS += $(common_javalib.jar) +ifeq ($(LOCAL_PROGUARD_ENABLED),disabled) + LOCAL_PROGUARD_ENABLED := +endif + ifneq (true,$(WITH_DEXPREOPT)) LOCAL_DEX_PREOPT := else @@ -62,7 +66,12 @@ include $(BUILD_SYSTEM)/java.mk ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true) # No dex; all we want are the .class files with resources. -$(common_javalib.jar) : $(full_classes_jar) $(java_resource_sources) +$(common_javalib.jar) : $(java_resource_sources) +ifdef LOCAL_PROGUARD_ENABLED +$(common_javalib.jar) : $(full_classes_proguard_jar) +else +$(common_javalib.jar) : $(full_classes_jar) +endif @echo "target Static Jar: $(PRIVATE_MODULE) ($@)" $(copy-file-to-target) ifneq ($(extra_jar_args),) |