Merge "Update intermediates dir of soong built system partition" into main am: a645e3d90e am: 296ffa1720
Original change: https://android-review.googlesource.com/c/platform/build/+/3405724
Change-Id: Ie519f68e2f6273b76a07e3fbc510b4c27a28b0ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/Makefile b/core/Makefile
index e106dad..1180073 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -6663,7 +6663,7 @@
@# Contents of the system image
ifneq ($(SOONG_DEFINED_SYSTEM_IMAGE_PATH),)
$(hide) $(call package_files-copy-root, \
- $(SOONG_DEFINED_SYSTEM_IMAGE_BASE)/root/system,$(zip_root)/SYSTEM)
+ $(SOONG_DEFINED_SYSTEM_IMAGE_BASE)/system/system,$(zip_root)/SYSTEM)
else
$(hide) $(call package_files-copy-root, \
$(SYSTEMIMAGE_SOURCE_DIR),$(zip_root)/SYSTEM)