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

Merge "sdk-addon: Prevent nested data/ inside $(PRIVATE_STAGING_DIR)" into main am: c80e7eeb77

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

Change-Id: Id56d95de97977f0d57632a2925e0c90b38a7df23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2024-05-01 19:46:56 +00:00
committed by Automerger Merge Worker
parent fc7bd470e8 c80e7eeb77
commit dabe8ef1f5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tasks/sdk-addon.mk
View File

@@ -126,7 +126,7 @@ $(full_target_img): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon
$(full_target_img): $(full_target) $(addon_img_source_prop) | $(SOONG_ZIP)
@echo Packaging SDK Addon System-Image: $@
$(hide) mkdir -p $(dir $@)
cp -R $(PRODUCT_OUT)/data $(PRIVATE_STAGING_DIR)/data
cp -R $(PRODUCT_OUT)/data $(PRIVATE_STAGING_DIR)
$(hide) $(SOONG_ZIP) -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(PRIVATE_STAGING_DIR)