Commit 60daab05 authored Feb 26, 2024 by DroidFreak32 Committed by Bruno Martins Jul 15, 2024

sdk-addon: Prevent nested data/ inside $(PRIVATE_STAGING_DIR)

Current logic recursively copies $(PRODUCT_OUT)/data into $(PRIVATE_STAGING_DIR)/data
This leads to creating $(PRIVATE_STAGING_DIR)/data/data on incremental
builds causing emulator to fail to boot.

Test: Build emulator sdk_addon twice, extract the zip, run the emulator
and verify it boots and reaches homescreen

Change-Id: I9e74d2ab28f9fbd67362578672d25d438fad0d53

parent 0ff3cb3c

core/tasks/sdk-addon.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@ $(full_target_img): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon
		$(full_target_img): $(full_target) $(addon_img_source_prop) \| $(SOONG_ZIP)
		@echo Packaging SDK Addon System-Image: $@
		$(hide) mkdir -p $(dir $@)
		cp -R $(PRODUCT_OUT)/data $(PRIVATE_STAGING_DIR)/data
		cp -R $(PRODUCT_OUT)/data $(PRIVATE_STAGING_DIR)
		$(hide) $(SOONG_ZIP) -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(PRIVATE_STAGING_DIR)