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

Commit f15cde7b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move ro.product.first_api_level to vendor/build.prop" into oc-mr1-dev

parents 6e12afad 9411f9b4

core/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -336,7 +336,11 @@ endif 


$(INSTALLED_BUILD_PROP_TARGET): $(intermediate_system_build_prop) $(INSTALLED_RECOVERYIMAGE_TARGET)

	@echo "Target build info: $@"

ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE

	$(hide) grep -v 'ro.product.first_api_level' $(intermediate_system_build_prop) > $@

else

	$(hide) cat $(intermediate_system_build_prop) > $@

endif

ifdef INSTALLED_RECOVERYIMAGE_TARGET

	$(hide) echo ro.expect.recovery_id=`cat $(RECOVERYIMAGE_ID_FILE)` >> $@

endif
@@ -356,10 +360,11 @@ FINAL_VENDOR_BUILD_PROPERTIES := $(call uniq-pairs-by-first-component, \ 
    $(FINAL_VENDOR_BUILD_PROPERTIES),=)

endif  # property_overrides_split_enabled



$(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(VENDOR_BUILDINFO_SH)

$(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(VENDOR_BUILDINFO_SH) $(intermediate_system_build_prop)

	@echo Target vendor buildinfo: $@

	@mkdir -p $(dir $@)

	$(hide) echo > $@

	$(hide) grep 'ro.product.first_api_level' $(intermediate_system_build_prop) >> $@

	$(hide) echo ro.vendor.build.date=`$(DATE_FROM_FILE)`>>$@

	$(hide) echo ro.vendor.build.date.utc=`$(DATE_FROM_FILE) +%s`>>$@

	$(hide) echo ro.vendor.build.fingerprint="$(BUILD_FINGERPRINT_FROM_FILE)">>$@