diff options
| author | 2019-03-12 16:35:31 +0000 | |
|---|---|---|
| committer | 2019-03-12 18:03:23 +0000 | |
| commit | ef0b949be34d22e2fbd2da3c414afcd2ea7d6608 (patch) | |
| tree | 8071f78598875305ba40a553e2cfad87aa897319 | |
| parent | c6bf520424a90e35194d4f83566eca5c3d4f31a2 (diff) | |
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
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rwxr-xr-x | tools/buildinfo_common.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index 8a73f4eedb..dca4200f4f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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 diff --git a/tools/buildinfo_common.sh b/tools/buildinfo_common.sh index f7f798ca0d..6041d79cdf 100755 --- a/tools/buildinfo_common.sh +++ b/tools/buildinfo_common.sh @@ -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" |