diff options
| author | Ying Wang <wangying@google.com> | 2010-09-29 14:50:41 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-09-29 16:08:17 -0700 |
| commit | 0b9382c792c303a93f5805adf4eba377dac01950 (patch) | |
| tree | 73796c5d5032c64fd64b4bb488008e3393589ac1 | |
| parent | c8c09e285d59f73334267deb9502c0927c616837 (diff) | |
| download | build-0b9382c792c303a93f5805adf4eba377dac01950.zip build-0b9382c792c303a93f5805adf4eba377dac01950.tar.gz build-0b9382c792c303a93f5805adf4eba377dac01950.tar.bz2 | |
Separate out Proguard flag files to fix dependency.
Bug: 3048005
Change-Id: I3e77ca1082cf7c92a43b249e5c887e3fbdf4ba11
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/java.mk | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 9681364..ee28f21 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -94,6 +94,7 @@ LOCAL_NO_EMMA_INSTRUMENT:= LOCAL_NO_EMMA_COMPILE:= LOCAL_PROGUARD_ENABLED:= # '',optonly,full,custom LOCAL_PROGUARD_FLAGS:= +LOCAL_PROGUARD_FLAG_FILES:= LOCAL_EMMA_COVERAGE_FILTER:= LOCAL_MANIFEST_FILE:= LOCAL_BUILD_HOST_DEX:= diff --git a/core/java.mk b/core/java.mk index 90e26c3..ab68214 100644 --- a/core/java.mk +++ b/core/java.mk @@ -260,11 +260,13 @@ endif # optonly endif # full endif # LOCAL_PROGUARD_ENABLED +proguard_flag_files := $(addprefix $(LOCAL_PATH)/, $(LOCAL_PROGUARD_FLAG_FILES)) +LOCAL_PROGUARD_FLAGS += $(addprefix -include , $(proguard_flag_files)) + $(full_classes_proguard_jar): PRIVATE_PROGUARD_ENABLED:=$(LOCAL_PROGUARD_ENABLED) $(full_classes_proguard_jar): PRIVATE_PROGUARD_FLAGS := $(proguard_flags) $(LOCAL_PROGUARD_FLAGS) $(full_classes_proguard_jar): PRIVATE_INSTRUMENTATION_FOR:=$(strip $(LOCAL_INSTRUMENTATION_FOR)) - -$(full_classes_proguard_jar): $(full_classes_full_names_jar) | $(ACP) $(PROGUARD) +$(full_classes_proguard_jar) : $(full_classes_full_names_jar) $(proguard_flag_files) | $(ACP) $(PROGUARD) $(call transform-jar-to-proguard) ALL_MODULES.$(LOCAL_MODULE).PROGUARD_ENABLED:=$(LOCAL_PROGUARD_ENABLED) |