openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

ro.build.expect.* sysprops are created in a separate rule 

This change is required to unify the build rules for */build.prop files;
The rules shouldn't have partition-specific actions.

Bug: 117892318
Test: m
Manually inspect ro.build.expect.[bootloader|baseband] props in
vendor/build.prop

Change-Id: I3b29b2728f779a9d7e1d71a5aa69b02ea940b3c6
This commit is contained in:
Jiyong Park 2020-05-25 17:56:09 +09:00
parent ca9b02c1ce
commit 3a2e95a63e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/sysprop.mk
View File

@ -270,6 +270,12 @@ else
vendor_prop_files := $(wildcard $(TARGET_DEVICE_DIR)/vendor.prop) vendor_prop_files := $(wildcard $(TARGET_DEVICE_DIR)/vendor.prop)
endif endif
android_info_prop := $(call intermediates-dir-for,ETC,android_info_prop)/android_info.prop
$(android_info_prop): $(INSTALLED_ANDROID_INFO_TXT_TARGET)
cat $< | grep 'require version-' | sed -e 's/require version-/ro.build.expect./g' > $@
vendor_prop_files += $(android_info_prop)
ifdef property_overrides_split_enabled ifdef property_overrides_split_enabled
FINAL_VENDOR_BUILD_PROPERTIES += \ FINAL_VENDOR_BUILD_PROPERTIES += \
$(call collapse-pairs, $(PRODUCT_PROPERTY_OVERRIDES) $(ADDITIONAL_VENDOR_PROPERTIES)) $(call collapse-pairs, $(PRODUCT_PROPERTY_OVERRIDES) $(ADDITIONAL_VENDOR_PROPERTIES))
@ -291,7 +297,6 @@ $(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(BUILDINFO_COMMON_SH) $(POST_PROCESS_PRO
$(hide) echo "#" >> $@; \ $(hide) echo "#" >> $@; \
echo "# ADDITIONAL VENDOR BUILD PROPERTIES" >> $@; \ echo "# ADDITIONAL VENDOR BUILD PROPERTIES" >> $@; \
echo "#" >> $@; echo "#" >> $@;
$(hide) cat $(INSTALLED_ANDROID_INFO_TXT_TARGET) | grep 'require version-' | sed -e 's/require version-/ro.build.expect./g' >> $@
ifdef property_overrides_split_enabled ifdef property_overrides_split_enabled
$(hide) $(foreach file,$(vendor_prop_files), \ $(hide) $(foreach file,$(vendor_prop_files), \
if [ -f "$(file)" ]; then \ if [ -f "$(file)" ]; then \