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

Commit 296ffa17 authored by Spandan Das's avatar Spandan Das Committed by Automerger Merge Worker
Browse files

Merge "Update intermediates dir of soong built system partition" into main am: a645e3d9 

Original change: https://android-review.googlesource.com/c/platform/build/+/3405724



Change-Id: If1aac9043941acf55456d8951871621c5341df4a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64d79108 a645e3d9

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6663,7 +6663,7 @@ ifdef BUILDING_SYSTEM_IMAGE 
	@# 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)