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

Commit 5dbc0cab authored by Ryan Campbell's avatar Ryan Campbell Committed by Android (Google) Code Review
Browse files

Merge "Create product sysprops on vendor partition." into oc-mr1-dev

parents 241539e1 aea0f92f

core/Makefile

+12 −2
Original line number Diff line number Diff line
@@ -299,7 +299,12 @@ endif 
			TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \

	        bash $(BUILDINFO_SH) >> $@

ifndef property_overrides_split_enabled

	$(hide) TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \

	$(hide) TARGET_DEVICE="$(TARGET_DEVICE)" \

			PRODUCT_NAME="$(TARGET_PRODUCT)" \

			PRODUCT_BRAND="$(PRODUCT_BRAND)" \

			PRODUCT_MODEL="$(PRODUCT_MODEL)" \

			PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \

			TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \

			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \

	        bash $(VENDOR_BUILDINFO_SH) >> $@

endif
@@ -359,7 +364,12 @@ $(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(VENDOR_BUILDINFO_SH) 
	$(hide) echo ro.vendor.build.date.utc=`$(DATE_FROM_FILE) +%s`>>$@

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

ifdef property_overrides_split_enabled

	$(hide) TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \

	$(hide) TARGET_DEVICE="$(TARGET_DEVICE)" \

			PRODUCT_NAME="$(TARGET_PRODUCT)" \

			PRODUCT_BRAND="$(PRODUCT_BRAND)" \

			PRODUCT_MODEL="$(PRODUCT_MODEL)" \

			PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \

			TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \

			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \

	        bash $(VENDOR_BUILDINFO_SH) >> $@

	$(hide) echo "#" >> $@; \

tools/vendor_buildinfo.sh

+6 −0
Original line number Diff line number Diff line
@@ -6,4 +6,10 @@ echo "# autogenerated by vendor_buildinfo.sh" 
echo "ro.product.board=$TARGET_BOOTLOADER_BOARD_NAME"

echo "ro.board.platform=$TARGET_BOARD_PLATFORM"



echo "ro.vendor.product.manufacturer=$PRODUCT_MANUFACTURER"

echo "ro.vendor.product.model=$PRODUCT_MODEL"

echo "ro.vendor.product.brand=$PRODUCT_BRAND"

echo "ro.vendor.product.name=$PRODUCT_NAME"

echo "ro.vendor.product.device=$TARGET_DEVICE"



echo "# end build properties"