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

Commit ef0b949b authored by Anton Hansson's avatar Anton Hansson
Browse files

Rename DEVICE arg in common buildprops script 

A followup change will make it not always equal TARGET_DEVICE,
so that name is unsuitable. Make its name follow the other product
variables.

Bug: 110206836
Test: presubmit
Change-Id: Icb1422ec5e7af658c5cc3070993c472e99805c6b
parent c6bf5204

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -234,11 +234,11 @@ define generate-common-build-props 
	PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \

	PLATFORM_VERSION="$(PLATFORM_VERSION)" \

	PRODUCT_BRAND="$(PRODUCT_BRAND)" \

	PRODUCT_DEVICE="$(TARGET_DEVICE)" \

	PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \

	PRODUCT_MODEL="$(PRODUCT_MODEL)" \

	PRODUCT_NAME="$(TARGET_PRODUCT)" \

	TARGET_BUILD_TYPE="$(TARGET_BUILD_VARIANT)" \

	TARGET_DEVICE="$(TARGET_DEVICE)" \

	bash $(BUILDINFO_COMMON_SH) "$(1)" >> $(2)

endef

tools/buildinfo_common.sh

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ echo "ro.${partition}.build.version.release=$PLATFORM_VERSION" 
echo "ro.${partition}.build.version.sdk=$PLATFORM_SDK_VERSION"



echo "ro.product.${partition}.brand=$PRODUCT_BRAND"

echo "ro.product.${partition}.device=$TARGET_DEVICE"

echo "ro.product.${partition}.device=$PRODUCT_DEVICE"

echo "ro.product.${partition}.manufacturer=$PRODUCT_MANUFACTURER"

echo "ro.product.${partition}.model=$PRODUCT_MODEL"

echo "ro.product.${partition}.name=$PRODUCT_NAME"