Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4df82b3e authored by Mihail Dumitrescu's avatar Mihail Dumitrescu
Browse files

Allow proguarding the main app and the test app in a single run. 

Bug: 12895101
Change-Id: I6804d73306a164d3e3ec0cab4743f9582b5ef2cf
parent f72e1846

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ LOCAL_PREBUILT_MODULE_FILE:= 
LOCAL_POST_INSTALL_CMD:=

LOCAL_DIST_BUNDLED_BINARIES:=

LOCAL_HAL_STATIC_LIBRARIES:=

LOCAL_TEST_MODULE_TO_PROGUARD_WITH:=



# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.

core/definitions.mk

+2 −1
Original line number Diff line number Diff line
@@ -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



###########################################################

core/java.mk

+7 −1
Original line number Diff line number Diff line
@@ -430,8 +430,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