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

Merge "Fix recovery_unit_test" am: 32e14db707 am: 7e8b6ff262

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2120582

Change-Id: I3f5fc85241d578b6f7adb91c17ad4a3cef46f110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bob Badour
2022-06-09 04:06:41 +00:00
committed by Automerger Merge Worker
parent 53a984e5b3 7e8b6ff262
commit 8990de63b9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ 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) $(SOONG_ZIP)
$(my_package_zip) : $(my_built_modules)
@echo "Package $@"
@rm -rf $(PRIVATE_STAGING_DIR) && mkdir -p $(PRIVATE_STAGING_DIR)
$(foreach p, $(PRIVATE_COPY_PAIRS),\
@@ -103,7 +103,7 @@ $(my_package_zip) : $(my_built_modules) $(SOONG_ZIP)
cp -Rf $(word 1,$(pair)) $(word 2,$(pair)) && ) true
$(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\
cp -RfL $(f) $(PRIVATE_STAGING_DIR) && ) true
$(hide) $(SOONG_ZIP) -o $@ -C $(PRIVATE_STAGING_DIR) -D $(PRIVATE_STAGING_DIR)
$(hide) cd $(PRIVATE_STAGING_DIR) && zip -rqX ../$(notdir $@) *
my_makefile :=
my_staging_dir :=