From 3d918b4bb74829d23475d4bd34c8fdc71bde014f Mon Sep 17 00:00:00 2001
From: Edward Wang <ewang@cyngn.com>
Date: Fri, 15 Apr 2016 23:03:14 -0700
Subject: [PATCH] build: skip 'ro.product.device' using  new macro
 "TARGET_SKIP_PRODUCT_DEVICE"

Change-Id: Id17ef7de8b0146dd6e4b2cc3cc5b88453da38f6c
Ticket: FEIJ-62
---
 core/Makefile      | 1 +
 core/product.mk    | 1 +
 tools/buildinfo.sh | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/Makefile b/core/Makefile
index 592e60d69..ce8410ca9 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -267,6 +267,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 3a344d422..e60b9da8c 100644
--- 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 b169c3d84..bb85e7a08 100755
--- 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"
-- 
2.11.0