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

Commit 36bf0df4 authored by android-build-prod (mdb)'s avatar android-build-prod (mdb) Committed by Gerrit Code Review
Browse files

Merge "Allow Soong to export multiple proguard flags files"

parents e8c3dfd9 42669e6d

core/soong_java_prebuilt.mk

+15 −10
Original line number Diff line number Diff line
@@ -40,13 +40,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
@@ -56,6 +49,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)