StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix pitfall: do not delete intermediates dir.

Browse Source 
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_coral_hwasan TARGET_BUILD_VARIANT=userdebug droid dist with-license platform_tests continuous_instrumentation_tests continuous_native_tests

Bug: 240342946

Change-Id: Ibf1bff6ee67e4958b1e1ea2fbc0385787d3bf0f0
Merged-in: Ibf1bff6ee67e4958b1e1ea2fbc0385787d3bf0f0
Merged-in: I6f0f2fa7861bca18e34576c920a3c33ffef6b46e
This commit is contained in:
Bob Badour
2022-06-06 16:59:33 -07:00
parent bb6cde6064
commit 917c60a267
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/tasks/tools/package-modules.mk
View File

@@ -27,7 +27,7 @@ LOCAL_MODULE_CLASS := PACKAGING
LOCAL_MODULE_STEM := $(my_package_name).zip LOCAL_MODULE_STEM := $(my_package_name).zip
LOCAL_UNINSTALLABLE_MODULE := true LOCAL_UNINSTALLABLE_MODULE := true
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk
my_staging_dir := $(intermediates) my_staging_dir := $(intermediates)/staging
my_package_zip := $(LOCAL_BUILT_MODULE) my_package_zip := $(LOCAL_BUILT_MODULE)
my_built_modules := $(foreach p,$(my_copy_pairs),$(call word-colon,1,$(p))) my_built_modules := $(foreach p,$(my_copy_pairs),$(call word-colon,1,$(p)))
@@ -94,17 +94,18 @@ ifneq ($(my_missing_error),)
endif endif
$(my_package_zip): PRIVATE_COPY_PAIRS := $(my_copy_pairs) $(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): PRIVATE_PICKUP_FILES := $(my_pickup_files)
$(my_package_zip) : $(my_built_modules) $(my_package_zip) : $(my_built_modules)
@echo "Package $@" @echo "Package $@"
@rm -rf $(dir $@) && mkdir -p $(dir $@) @rm -rf $(PRIVATE_STAGING_DIR) && mkdir -p $(PRIVATE_STAGING_DIR)
$(foreach p, $(PRIVATE_COPY_PAIRS),\ $(foreach p, $(PRIVATE_COPY_PAIRS),\
$(eval pair := $(subst :,$(space),$(p)))\ $(eval pair := $(subst :,$(space),$(p)))\
mkdir -p $(dir $(word 2,$(pair))) && \ mkdir -p $(dir $(word 2,$(pair))) && \
cp -Rf $(word 1,$(pair)) $(word 2,$(pair)) && ) true cp -Rf $(word 1,$(pair)) $(word 2,$(pair)) && ) true
$(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\ $(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\
cp -RfL $(f) $(dir $@) && ) true cp -RfL $(f) $(PRIVATE_STAGING_DIR) && ) true
$(hide) cd $(dir $@) && zip -rqX $(notdir $@) * $(hide) cd $(PRIVATE_STAGING_DIR) && zip -rqX ../$(notdir $@) *
my_makefile := my_makefile :=
my_staging_dir := my_staging_dir :=