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

Commit 4978192a authored by Andres Morales's avatar Andres Morales Committed by Android Git Automerger
Browse files

am 89a87488: am b5df7d48: Merge "Add version strings from android-info.txt into build.prop" 

* commit '89a87488':
  Add version strings from android-info.txt into build.prop
parents 050f21cb 89a87488

core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ system_prop_file := $(TARGET_SYSTEM_PROP) 
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 > $@
@@ -226,6 +226,7 @@ endif 
		        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 :=