diff options
| author | Yi-Yo Chiang <yochiang@google.com> | 2024-03-27 01:55:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-27 01:55:51 +0000 |
| commit | bb508889871ef017176880568a460fed95179226 (patch) | |
| tree | d7c5f0e4e0f702f3888c45eaf024fd34af56d514 | |
| parent | 65c865bd05dbb41316e7a3769018c40ce5ee797c (diff) | |
| parent | adaf1c6f119d8c075fbb476102f23b3c98d28ed7 (diff) | |
| download | build-bb508889871ef017176880568a460fed95179226.tar.gz | |
Merge "Copy build.prop[-<part>] to dist dir only if the corresponding partition image is being built" into main
| -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) \ |