commit b5df7d483772d1dd08a1d5c8614f38a79e43ec12
author Andres Morales <anmorales@google.com> Mon Feb 09 22:45:56 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 09 22:45:57 2015 +0000
tree cf9dcfafc6a02b46356defba921f5a17dae39a16
parent b998054f50043c23e8599ee3cfae058ac378c5cb
parent 085a0ce75666d6e4281c7a74b690a4bd7d142c8d

Merge "Add version strings from android-info.txt into build.prop"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 4f39d5e..85c575b 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -171,7 +171,7 @@
 else
 system_prop_file := $(wildcard $(TARGET_DEVICE_DIR)/system.prop)
 endif
-$(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $(BUILD_SYSTEM)/version_defaults.mk $(system_prop_file)
+$(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $(BUILD_SYSTEM)/version_defaults.mk $(system_prop_file) $(INSTALLED_ANDROID_INFO_TXT_TARGET)
 	@echo Target buildinfo: $@
 	@mkdir -p $(dir $@)
 	$(hide) echo > $@
@@ -225,6 +225,7 @@
 		        echo "#" >> $@; )
 	$(hide) $(foreach line,$(ADDITIONAL_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/tools/post_process_props.py $@ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_PROPERTY_BLACKLIST)
 
 build_desc :=