Revert "build: skip 'ro.product.device' using new macro "TARGET_SKIP_PRODUCT_DEVICE""
* Not used by any device, can be implemented using
PRODUCT_SYSTEM_PROPERTY_BLACKLIST instead
This reverts commit 3d918b4bb74829d23475d4bd34c8fdc71bde014f.
Change-Id: I1b48231d0a269d8a7fe08945ffebf55253ddf18f
diff --git a/core/Makefile b/core/Makefile
index af9f264..a8cb8c6 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -278,7 +278,6 @@
TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \
TARGET_UNIFIED_DEVICE="$(TARGET_UNIFIED_DEVICE)" \
TARGET_SKIP_DEFAULT_LOCALE="$(TARGET_SKIP_DEFAULT_LOCALE)" \
- TARGET_SKIP_PRODUCT_DEVICE="$(TARGET_SKIP_PRODUCT_DEVICE)" \
$(PRODUCT_BUILD_PROP_OVERRIDES) \
bash $(BUILDINFO_SH) >> $@
$(hide) $(foreach file,$(system_prop_file), \
diff --git a/core/product.mk b/core/product.mk
index b13a38f..3ede4b2 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -349,7 +349,6 @@
_product_stash_var_list += \
TARGET_SKIP_DEFAULT_LOCALE \
- TARGET_SKIP_PRODUCT_DEVICE \
#
# Stash values of the variables in _product_stash_var_list.
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh
index 9ce7adf..2750231 100755
--- a/tools/buildinfo.sh
+++ b/tools/buildinfo.sh
@@ -52,9 +52,7 @@
if [ "$TARGET_UNIFIED_DEVICE" == "" ] ; then
echo "# ro.build.product is obsolete; use ro.product.device"
echo "ro.build.product=$TARGET_DEVICE"
- if [ -z "$TARGET_SKIP_PRODUCT_DEVICE" ] ; then
- echo "ro.product.model=$PRODUCT_MODEL"
- fi
+ echo "ro.product.model=$PRODUCT_MODEL"
echo "ro.product.device=$TARGET_DEVICE"
echo "# Do not try to parse description, fingerprint, or thumbprint"
echo "ro.build.description=$PRIVATE_BUILD_DESC"