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

Commit 5709c4a9 authored by Yi-yo Chiang's avatar Yi-yo Chiang Committed by Gerrit Code Review
Browse files

Merge "Unconditionally copy the system build.prop into target_files archive"

parents 7c88c9c1 9b258417

core/Makefile

+10 −0
Original line number Diff line number Diff line
@@ -4983,6 +4983,10 @@ endef 
# image.

ifdef BUILDING_SYSTEM_IMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(FULL_SYSTEMIMAGE_DEPS)

else

  # releasetools may need the system build.prop even when building a

  # system-image-less product.

  $(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_BUILD_PROP_TARGET)

endif



ifdef BUILDING_USERDATA_IMAGE
@@ -5229,6 +5233,12 @@ ifdef BUILDING_SYSTEM_IMAGE 
	@# Contents of the system image

	$(hide) $(call package_files-copy-root, \

	    $(SYSTEMIMAGE_SOURCE_DIR),$(zip_root)/SYSTEM)

else ifdef INSTALLED_BUILD_PROP_TARGET

	@# Copy the system build.prop even if not building a system image

	@# because add_img_to_target_files may need it to build other partition

	@# images.

	$(hide) mkdir -p "$(zip_root)/SYSTEM"

	$(hide) cp "$(INSTALLED_BUILD_PROP_TARGET)" "$(patsubst $(TARGET_OUT)/%,$(zip_root)/SYSTEM/%,$(INSTALLED_BUILD_PROP_TARGET))"

endif

ifdef BUILDING_USERDATA_IMAGE

	@# Contents of the data image