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

Merge "Move board-info props to vendor/build.prop" into qt-dev

Browse Source
This commit is contained in:
Anton Hansson
2019-04-10 12:39:24 +00:00
committed by Android (Google) Code Review
parent 2ab5c90e9c 0643efcc5a
commit 9ce8087afc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@@ -483,7 +483,6 @@ endif
echo "#" >> $@; ) echo "#" >> $@; )
$(hide) $(foreach line,$(FINAL_BUILD_PROPERTIES), \ $(hide) $(foreach line,$(FINAL_BUILD_PROPERTIES), \
echo "$(line)" >> $@;) 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) $(hide) build/make/tools/post_process_props.py $@ $(PRODUCT_SYSTEM_PROPERTY_BLACKLIST)
build_desc := build_desc :=
@@ -532,10 +531,11 @@ endif
echo "# BOOTIMAGE_BUILD_PROPERTIES" >> $@; \ echo "# BOOTIMAGE_BUILD_PROPERTIES" >> $@; \
echo "#" >> $@; echo "#" >> $@;
$(hide) $(call generate-common-build-props,bootimage,$@) $(hide) $(call generate-common-build-props,bootimage,$@)
ifdef property_overrides_split_enabled
$(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
$(hide) $(foreach line,$(FINAL_VENDOR_BUILD_PROPERTIES), \ $(hide) $(foreach line,$(FINAL_VENDOR_BUILD_PROPERTIES), \
echo "$(line)" >> $@;) echo "$(line)" >> $@;)
endif # property_overrides_split_enabled endif # property_overrides_split_enabled