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

Commit c5fa0e7f authored by Jeff Gaston's avatar Jeff Gaston
Browse files

resolve merge conflicts of 8bbbd87e to stage-aosp-master 

Test: I solemnly swear I tested this conflict resolution.
Merged-In: Id2d18fe41de5d533baf1f082292d70d946386249
Change-Id: Ibc66733eb7879f2be2458e922641fec3a899beab
parents 4a5a1e15 8bbbd87e

core/tasks/sdk-addon.mk

+2 −2
Original line number Diff line number Diff line
@@ -111,13 +111,13 @@ $(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)

	@echo Packaging SDK Addon System-Image: $@

	$(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)





.PHONY: sdk_addon