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

Commit 93eeaf4f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix pitfall: do not delete intermediates dir." am: 5c6b4e02 

Original change: https://android-review.googlesource.com/c/platform/build/+/2116088



Change-Id: I184b8606377d81b4deda9ee0eb0ac36f8edfd39e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 123a85e7 5c6b4e02

core/tasks/tools/package-modules.mk

+6 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ LOCAL_MODULE_CLASS := PACKAGING 
LOCAL_MODULE_STEM := $(my_package_name).zip

LOCAL_UNINSTALLABLE_MODULE := true

include $(BUILD_SYSTEM)/base_rules.mk

my_staging_dir := $(intermediates)

my_staging_dir := $(intermediates)/staging

my_package_zip := $(LOCAL_BUILT_MODULE)



my_built_modules := $(foreach p,$(my_copy_pairs),$(call word-colon,1,$(p)))
@@ -92,17 +92,18 @@ ifneq ($(my_missing_error),) 
endif



$(my_package_zip): PRIVATE_COPY_PAIRS := $(my_copy_pairs)

$(my_package_zip): PRIVATE_STAGING_DIR := $(my_staging_dir)

$(my_package_zip): PRIVATE_PICKUP_FILES := $(my_pickup_files)

$(my_package_zip) : $(my_built_modules)

$(my_package_zip) : $(my_built_modules) $(SOONG_ZIP)

	@echo "Package $@"

	@rm -rf $(dir $@) && mkdir -p $(dir $@)

	@rm -rf $(PRIVATE_STAGING_DIR) && mkdir -p $(PRIVATE_STAGING_DIR)

	$(foreach p, $(PRIVATE_COPY_PAIRS),\

	  $(eval pair := $(subst :,$(space),$(p)))\

	  mkdir -p $(dir $(word 2,$(pair))) && \

	  cp -Rf $(word 1,$(pair)) $(word 2,$(pair)) && ) true

	$(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\

	  cp -RfL $(f) $(dir $@) && ) true

	$(hide) cd $(dir $@) && zip -rqX $(notdir $@) *

	  cp -RfL $(f) $(PRIVATE_STAGING_DIR) && ) true

	$(hide) $(SOONG_ZIP) -o $@ -C $(PRIVATE_STAGING_DIR) -D $(PRIVATE_STAGING_DIR)



my_makefile :=

my_staging_dir :=