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