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

Commit 0b9382c7 authored by Ying Wang's avatar Ying Wang
Browse files

Separate out Proguard flag files to fix dependency. 

Bug: 3048005
Change-Id: I3e77ca1082cf7c92a43b249e5c887e3fbdf4ba11
parent c8c09e28

core/clear_vars.mk

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

core/java.mk

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