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

Commit 74b71317 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 2d72094f: am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp 

* commit '2d72094f':
  Allow proguarding the main app and the test app in a single run.
parents 7495e68a 2d72094f

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ LOCAL_EMMA_INSTRUMENT:= 
LOCAL_PROGUARD_ENABLED:= # '',full,custom,nosystem,disabled,obfuscation,optimization

LOCAL_PROGUARD_FLAGS:=

LOCAL_PROGUARD_FLAG_FILES:=

LOCAL_TEST_MODULE_TO_PROGUARD_WITH:=

LOCAL_EMMA_COVERAGE_FILTER:=

LOCAL_WARNINGS_ENABLE:=

LOCAL_FULL_MANIFEST_FILE:=

core/definitions.mk

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