Merge "Fix sdk-addon for absolute OUT_DIR"

This commit is contained in:
Jeff Gaston 2017-09-14 01:51:02 +00:00 committed by Gerrit Code Review
commit 8bbbd87ef6

View file

@ -112,14 +112,14 @@ $(full_target): $(sdk_addon_deps) | $(ACP)
$(ACP) -r $$d $(PRIVATE_STAGING_DIR)/docs ;\ $(ACP) -r $$d $(PRIVATE_STAGING_DIR)/docs ;\
done done
$(hide) mkdir -p $(dir $@) $(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): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_img))/images/$(TARGET_CPU_ABI)
$(full_target_img): $(full_target) $(addon_img_source_prop) | $(ACP) $(full_target_img): $(full_target) $(addon_img_source_prop) | $(ACP)
@echo Packaging SDK Addon System-Image: $@ @echo Packaging SDK Addon System-Image: $@
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(ACP) -r $(PRODUCT_OUT)/data $(PRIVATE_STAGING_DIR)/data $(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 .PHONY: sdk_addon