From a4d1f6a7f0399b5e5e38b7c6f274f5fb11be48b9 Mon Sep 17 00:00:00 2001 From: Raphael Moll Date: Thu, 9 Oct 2014 17:48:12 -0700 Subject: [PATCH] SDK Addon multi-sys-img support. Fix an issue where the add-on system images have 2 extra inner folders. The sole root folder in the zip file should be the ABI one. Change-Id: Ie12b913438e2b1113d34222e467ff280daa23c7f --- 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 b32536cef..5ac9b7d47 100644 --- a/core/tasks/sdk-addon.mk +++ b/core/tasks/sdk-addon.mk @@ -80,7 +80,7 @@ $(foreach cf,$(files_to_copy), \ ) # The system-image source.properties is a template that we directly expand in-place -addon_img_source_prop := $(call append-path,$(staging),$(addon_dir_img))/images/source.properties +addon_img_source_prop := $(call append-path,$(staging),$(addon_dir_img))/images/$(TARGET_CPU_ABI)/source.properties sdk_addon_deps += $(addon_img_source_prop) $(addon_img_source_prop): $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP) @@ -113,7 +113,7 @@ $(full_target): $(sdk_addon_deps) | $(ACP) $(hide) mkdir -p $(dir $@) $(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rq $$F $(notdir $(PRIVATE_STAGING_DIR)) ) -$(full_target_img): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_img)) +$(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) @echo Packaging SDK Addon System-Image: $@ $(hide) mkdir -p $(dir $@)