diff options
| author | Yi-Yo Chiang <yochiang@google.com> | 2024-03-25 15:46:00 +0800 |
|---|---|---|
| committer | Yi-Yo Chiang <yochiang@google.com> | 2024-03-25 16:04:00 +0800 |
| commit | adaf1c6f119d8c075fbb476102f23b3c98d28ed7 (patch) | |
| tree | f4bb14b41dfe399a69869268d84d7fce10025931 | |
| parent | bd61eeecd75ec69bd3c60924f61028db73742c3b (diff) | |
| download | build-adaf1c6f119d8c075fbb476102f23b3c98d28ed7.tar.gz | |
Copy build.prop[-<part>] to dist dir only if the corresponding partition
image is being built
Bug: 330834204
Test: Build dist and check that build.prop is not copied if not building
its partition
Change-Id: Iab08ef10e7c723867c2cf3ab4f297918dca989d3
| -rw-r--r-- | core/main.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/main.mk b/core/main.mk index c1cafc0c89..051ebdd812 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1859,12 +1859,12 @@ else ifeq ($(TARGET_BUILD_UNBUNDLED),$(TARGET_BUILD_UNBUNDLED_IMAGE)) $(INSTALLED_FILES_JSON_SYSTEMOTHER) \ $(INSTALLED_FILES_FILE_RECOVERY) \ $(INSTALLED_FILES_JSON_RECOVERY) \ - $(INSTALLED_BUILD_PROP_TARGET):build.prop \ - $(INSTALLED_VENDOR_BUILD_PROP_TARGET):build.prop-vendor \ - $(INSTALLED_PRODUCT_BUILD_PROP_TARGET):build.prop-product \ - $(INSTALLED_ODM_BUILD_PROP_TARGET):build.prop-odm \ - $(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET):build.prop-system_ext \ - $(INSTALLED_RAMDISK_BUILD_PROP_TARGET):build.prop-ramdisk \ + $(if $(BUILDING_SYSTEM_IMAGE), $(INSTALLED_BUILD_PROP_TARGET):build.prop) \ + $(if $(BUILDING_VENDOR_IMAGE), $(INSTALLED_VENDOR_BUILD_PROP_TARGET):build.prop-vendor) \ + $(if $(BUILDING_PRODUCT_IMAGE), $(INSTALLED_PRODUCT_BUILD_PROP_TARGET):build.prop-product) \ + $(if $(BUILDING_ODM_IMAGE), $(INSTALLED_ODM_BUILD_PROP_TARGET):build.prop-odm) \ + $(if $(BUILDING_SYSTEM_EXT_IMAGE), $(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET):build.prop-system_ext) \ + $(if $(BUILDING_RAMDISK_IMAGE), $(INSTALLED_RAMDISK_BUILD_PROP_TARGET):build.prop-ramdisk) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) \ $(INSTALLED_MISC_INFO_TARGET) \ $(INSTALLED_RAMDISK_TARGET) \ |