build: skip 'ro.product.device' using new macro "TARGET_SKIP_PRODUCT_DEVICE"

Change-Id: Id17ef7de8b0146dd6e4b2cc3cc5b88453da38f6c
Ticket: FEIJ-62

diff --git a/core/Makefile b/core/Makefile
index ac0c925..9dfd40d 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -278,6 +278,7 @@ endif
                        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 078066e..1a0fe31 100644 (file)
--- a/core/product.mk
+++ b/core/product.mk
@@ -296,6 +296,7 @@ _product_stash_var_list += \
 
 _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 b169c3d..bb85e7a 100755 (executable)
--- a/tools/buildinfo.sh
+++ b/tools/buildinfo.sh
@@ -52,7 +52,9 @@ echo "ro.board.platform=$TARGET_BOARD_PLATFORM"
 if [ "$TARGET_UNIFIED_DEVICE" == "" ] ; then
   echo "# ro.build.product is obsolete; use ro.product.device"
   echo "ro.build.product=$TARGET_DEVICE"
-  echo "ro.product.model=$PRODUCT_MODEL"
+  if [ -z "$TARGET_SKIP_PRODUCT_DEVICE" ] ; then
+    echo "ro.product.model=$PRODUCT_MODEL"
+  fi
   echo "ro.product.device=$TARGET_DEVICE"
   echo "# Do not try to parse description, fingerprint, or thumbprint"
   echo "ro.build.description=$PRIVATE_BUILD_DESC"