From 43f34573296abbe6490b4968a6aa7a3b11b23818 Mon Sep 17 00:00:00 2001 From: Jeff Gaston Date: Wed, 13 Sep 2017 15:21:50 -0700 Subject: [PATCH] Fix sdk-addon for absolute OUT_DIR Bug: 65286453 Test: m -j OUT_DIR=/tmp/abs PRODUCT-sdk_gphone_x86-sdk_addon /tmp/abs/host/linux-x86/sdk_addon/google_phone_x86-eng.jeffrygaston-linux-x86.zip Change-Id: Id2d18fe41de5d533baf1f082292d70d946386249 --- core/tasks/sdk-addon.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk index e26773ce80..2725f950cb 100644 --- a/core/tasks/sdk-addon.mk +++ b/core/tasks/sdk-addon.mk @@ -112,14 +112,14 @@ $(full_target): $(sdk_addon_deps) | $(ACP) $(ACP) -r $$d $(PRIVATE_STAGING_DIR)/docs ;\ done $(hide) mkdir -p $(dir $@) - $(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rqX $$F $(notdir $(PRIVATE_STAGING_DIR)) ) + $(hide) soong_zip -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(PRIVATE_STAGING_DIR) $(full_target_img): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_img))/images/$(TARGET_CPU_ABI) $(full_target_img): $(full_target) $(addon_img_source_prop) | $(ACP) @echo Packaging SDK Addon System-Image: $@ $(hide) mkdir -p $(dir $@) $(ACP) -r $(PRODUCT_OUT)/data $(PRIVATE_STAGING_DIR)/data - $(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rqX $$F $(notdir $(PRIVATE_STAGING_DIR)) ) + $(hide) soong_zip -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(PRIVATE_STAGING_DIR) .PHONY: sdk_addon