From 25939e224e1cc0522f9028d3decafa878c3b171c Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Tue, 9 Nov 2010 08:53:01 -0800
Subject: [PATCH] Set ro.build.characteristics to the value from
 PRODUCT_CHARACTERISTICS that's also passed to aapt.

Bug: 3144768
Change-Id: Ic1724c64d015de7a5c4f13709b91db51b8f10872
---
 core/Makefile      | 1 +
 tools/buildinfo.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/Makefile b/core/Makefile
index f6a8191412..ca7eba043a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -149,6 +149,7 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $(
 			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \
 			TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \
 			TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \
+			TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \
 	        bash $(BUILDINFO_SH) > $@
 	$(hide) if [ -f $(TARGET_DEVICE_DIR)/system.prop ]; then \
 	          cat $(TARGET_DEVICE_DIR)/system.prop >> $@; \
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh
index ce3ee81a13..e3fe99c111 100755
--- a/tools/buildinfo.sh
+++ b/tools/buildinfo.sh
@@ -40,5 +40,6 @@ echo "ro.build.product=$TARGET_DEVICE"
 echo "# Do not try to parse ro.build.description or .fingerprint"
 echo "ro.build.description=$PRIVATE_BUILD_DESC"
 echo "ro.build.fingerprint=$BUILD_FINGERPRINT"
+echo "ro.build.characteristics=$TARGET_AAPT_CHARACTERISTICS"
 
 echo "# end build properties"