From 3a2ff8e27ec0bed13002a4a9ae568a636f5ea010 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 21 Nov 2023 15:20:49 -0800 Subject: [PATCH] Use files written by Soong Soong now writes transitive resource packages and combined proguard flags files to files instead of passing them as a list to Make, so Make no longer needs to write them to files. Bug: 309006256 Test: m checkbuild Change-Id: I3ff78047f417f8578063f9c7a97ef4c65ba33af3 --- core/soong_java_prebuilt.mk | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index 9744abf3b8..7f85231543 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -93,26 +93,11 @@ ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE $(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_res_package)) my_transitive_res_packages := $(intermediates.COMMON)/transitive-res-packages - $(my_transitive_res_packages): PRIVATE_TRANSITIVE_RES_PACKAGES := $(filter-out $(LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE),$(LOCAL_SOONG_TRANSITIVE_RES_PACKAGES)) - $(my_transitive_res_packages): - @echo Write transitive resource package list $@ - rm -f $@ - touch $@ - $(foreach f,$(PRIVATE_TRANSITIVE_RES_PACKAGES),\ - echo "$f" >> $@; ) - + $(eval $(call copy-one-file,$(LOCAL_SOONG_TRANSITIVE_RES_PACKAGES),$(my_transitive_res_packages))) $(call add-dependency,$(my_res_package),$(my_transitive_res_packages)) 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 - + $(eval $(call copy-one-file,$(LOCAL_SOONG_EXPORT_PROGUARD_FLAGS),$(my_proguard_flags))) $(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_proguard_flags)) my_static_library_extra_packages := $(intermediates.COMMON)/extra_packages