StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unconditionally copy the system build.prop into target_files archive" am: 5709c4a93f am: 5efc0feefa am: c0db3151ce

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1935974

Change-Id: Ic00a587220728e5ad253c1407381074f2fa37ba0
This commit is contained in:
Yi-yo Chiang
2022-01-07 06:13:02 +00:00
committed by Automerger Merge Worker
parent 9c4a78ceae c0db3151ce
commit 94e499b4e2
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/Makefile
View File

@@ -4983,6 +4983,10 @@ endef
# image. # image.
ifdef BUILDING_SYSTEM_IMAGE ifdef BUILDING_SYSTEM_IMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(FULL_SYSTEMIMAGE_DEPS) $(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 endif
ifdef BUILDING_USERDATA_IMAGE ifdef BUILDING_USERDATA_IMAGE
@@ -5229,6 +5233,12 @@ ifdef BUILDING_SYSTEM_IMAGE
@# Contents of the system image @# Contents of the system image
$(hide) $(call package_files-copy-root, \ $(hide) $(call package_files-copy-root, \
$(SYSTEMIMAGE_SOURCE_DIR),$(zip_root)/SYSTEM) $(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 endif
ifdef BUILDING_USERDATA_IMAGE ifdef BUILDING_USERDATA_IMAGE
@# Contents of the data image @# Contents of the data image