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

Commit 4cdbaf11 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"" 

This reverts commit 30d6869f.

Fixes an issue with the original change where proguard files without
newlines at the end of the file would get merged with the next file.
Most of the time the next file started with a comment, which worked
fine, but sometimes it was a syntax error.

Bug: 72969557
Test: m
Test: build on an internal tree that failed last time
Change-Id: I66f13ae80ee0f96b456e526bfbfc2cdcf82c3f3a
parent 2744cbf1

core/static_java_library.mk

+9 −2
Original line number Diff line number Diff line
@@ -119,10 +119,17 @@ 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 $+ >$@

	touch $@

	for f in $+; do \

		echo -e "\n# including $$f" >>$@; \

		cat $$f >>$@; \

	done

import_proguard_flag_files :=

endif



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