commit ef0b949be34d22e2fbd2da3c414afcd2ea7d6608
author Anton Hansson <hansson@google.com> Tue Mar 12 16:35:31 2019 +0000
committer Anton Hansson <hansson@google.com> Tue Mar 12 18:03:23 2019 +0000
tree 8071f78598875305ba40a553e2cfad87aa897319
parent c6bf520424a90e35194d4f83566eca5c3d4f31a2

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

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 8a73f4e..dca4200 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -234,11 +234,11 @@
 	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