Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 983c7569 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

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

parents 33edbc98 c65ebaf6

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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