From c65ebaf61132f84321dfda90c087a968bb0b64ff Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 9 Apr 2019 16:21:51 +0100 Subject: [PATCH] Move board-info props to vendor/build.prop This change moves the ro.build.require.* props extracted from TARGET_BOARD_INFO_FILE to vendor/build.prop as opposed to system/build.prop. These typically contain what bootloader and baseband the build requires, which are very device-specific. Bug: 130025216 Test: make, inspect props Test: flash blueline Change-Id: I48642485bdc853884d465d1fe00f2ceae69a4736 Merged-In: I48642485bdc853884d465d1fe00f2ceae69a4736 --- core/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index 90f2722c5..66706fc50 100644 --- a/core/Makefile +++ b/core/Makefile @@ -483,7 +483,6 @@ endif echo "#" >> $@; ) $(hide) $(foreach line,$(FINAL_BUILD_PROPERTIES), \ echo "$(line)" >> $@;) - $(hide) cat $(INSTALLED_ANDROID_INFO_TXT_TARGET) | grep 'require version-' | sed -e 's/require version-/ro.build.expect./g' >> $@ $(hide) build/make/tools/post_process_props.py $@ $(PRODUCT_SYSTEM_PROPERTY_BLACKLIST) build_desc := @@ -528,10 +527,11 @@ $(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(BUILDINFO_COMMON_SH) $(intermediate_sys echo "# BOOTIMAGE_BUILD_PROPERTIES" >> $@; \ echo "#" >> $@; $(hide) $(call generate-common-build-props,bootimage,$@) -ifdef property_overrides_split_enabled $(hide) echo "#" >> $@; \ echo "# ADDITIONAL VENDOR BUILD PROPERTIES" >> $@; \ 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 $(hide) $(foreach line,$(FINAL_VENDOR_BUILD_PROPERTIES), \ echo "$(line)" >> $@;) endif # property_overrides_split_enabled