diff options
| author | Cole Faust <colefaust@google.com> | 2024-05-01 19:32:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-01 19:32:12 +0000 |
| commit | c80e7eeb7780f902780fa1b602b31bfbd5455914 (patch) | |
| tree | 3e535de3df4093ba07beece7f1d2ce78898c5fbe | |
| parent | 0c2ef754f384e8bc76d0a72498eec1177fab2a4c (diff) | |
| parent | a326537e1049155da9a872137d97eb8e21019772 (diff) | |
| download | build-c80e7eeb7780f902780fa1b602b31bfbd5455914.tar.gz | |
Merge "sdk-addon: Prevent nested data/ inside $(PRIVATE_STAGING_DIR)" into main
| -rw-r--r-- | core/tasks/sdk-addon.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk index 7acac72f1d..2fd4ce9ec7 100644 --- a/core/tasks/sdk-addon.mk +++ b/core/tasks/sdk-addon.mk @@ -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) |