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

Commit 0fd12344 authored by Colin Cross's avatar Colin Cross
Browse files

Allow Soong to export multiple proguard flags files 

Soong uses lists of proguard flags files from dependencies instead
of a single concatenated file.  Allow Soong to pass the list to
make, which will concatenate it.

Move the check inside ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
in case Soong exports an Android library with an empty
LOCAL_SOONG_EXPORT_PROGUARD_FLAGS.

Bug: 73724997
Test: m checkbuild
Change-Id: Ia8f229ec5f9fc99a23bd471dfa70c9de7316de94
Merged-In: Ia8f229ec5f9fc99a23bd471dfa70c9de7316de94
(cherry picked from commit 42669e6d)
parent af719008

core/soong_java_prebuilt.mk

+15 −10
Original line number Diff line number Diff line
@@ -39,13 +39,6 @@ ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR 
    $(intermediates.COMMON)/jacoco-report-classes.jar)

endif



ifdef LOCAL_SOONG_EXPORT_PROGUARD_FLAGS

  $(eval $(call copy-one-file,$(LOCAL_SOONG_EXPORT_PROGUARD_FLAGS),\

    $(intermediates.COMMON)/export_proguard_flags))

  $(call add-dependency,$(LOCAL_BUILT_MODULE),\

    $(intermediates.COMMON)/export_proguard_flags)

endif



ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE

  my_res_package := $(intermediates.COMMON)/package-res.apk
@@ -55,6 +48,18 @@ $(my_res_package): $(LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE) 


  $(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_res_package))



  my_proguard_flags := $(intermediates.COMMON)/export_proguard_flags

  $(my_proguard_flags): $(LOCAL_SOONG_EXPORT_PROGUARD_FLAGS)

	@echo "Export proguard flags: $@"

	rm -f $@

	touch $@

	for f in $+; do \

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

		cat $$f >>$@; \

	done



  $(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_proguard_flags))



endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE



ifneq ($(TURBINE_ENABLED),false)