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

Commit df5d7da7 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES 

Packages would use proguard rules from their
LOCAL_STATIC_ANDROID_LIBRARIES, but other libraries wouldn't propagate
the rules from their LOCAL_STATIC_ANDROID_LIBRARIES.

Bug: 72969557
Test: m
Change-Id: I514af02627d78c48cf6cd08d4b3c17911c6bac2f
parent b5751e4b

core/static_java_library.mk

+4 −1
Original line number Diff line number Diff line
@@ -119,10 +119,13 @@ endif 
endif



ifdef LOCAL_USE_AAPT2

$(intermediates.COMMON)/export_proguard_flags: $(addprefix $(LOCAL_PATH)/,$(LOCAL_EXPORT_PROGUARD_FLAG_FILES))

import_proguard_flag_files := $(strip $(foreach l,$(LOCAL_STATIC_ANDROID_LIBRARIES),\

    $(call intermediates-dir-for,JAVA_LIBRARIES,$(l),,COMMON)/export_proguard_flags))

$(intermediates.COMMON)/export_proguard_flags: $(import_proguard_flag_files) $(addprefix $(LOCAL_PATH)/,$(LOCAL_EXPORT_PROGUARD_FLAG_FILES))

	@echo "Export proguard flags: $@"

	rm -f $@

	cat $+ >$@

import_proguard_flag_files :=

endif



# add --non-constant-id to prevent inlining constants.