Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a024dbb authored by Jeff Gaston's avatar Jeff Gaston Committed by android-build-merger
Browse files

Merge "Fix sdk-addon build on build servers" into stage-aosp-master 

am: 7a8ab7e2

Change-Id: I77aad5d46c343f6cc734c99a75c518ac6726c07a
parents 5da4706a 7a8ab7e2

core/tasks/sdk-addon.mk

+4 −4
Original line number Original line Diff line number Diff line
@@ -104,20 +104,20 @@ $(full_target): PRIVATE_DOCS_DIRS := $(addprefix $(OUT_DOCS)/, $(doc_modules)) 




$(full_target): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_leaf))

$(full_target): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_leaf))





$(full_target): $(sdk_addon_deps) | $(ACP)

$(full_target): $(sdk_addon_deps) | $(ACP) $(SOONG_ZIP)

	@echo Packaging SDK Addon: $@

	@echo Packaging SDK Addon: $@

	$(hide) mkdir -p $(PRIVATE_STAGING_DIR)/docs

	$(hide) mkdir -p $(PRIVATE_STAGING_DIR)/docs

	$(hide) for d in $(PRIVATE_DOCS_DIRS); do \

	$(hide) for d in $(PRIVATE_DOCS_DIRS); do \

	    $(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) soong_zip -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(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)

$(full_target_img): $(full_target) $(addon_img_source_prop) | $(SOONG_ZIP)

	@echo Packaging SDK Addon System-Image: $@

	@echo Packaging SDK Addon System-Image: $@

	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)

	$(hide) soong_zip -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(PRIVATE_STAGING_DIR)

	$(hide) $(SOONG_ZIP) -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(PRIVATE_STAGING_DIR)









.PHONY: sdk_addon

.PHONY: sdk_addon