From 879b007555b3cb565fd73e71d3823a08e8e8a067 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Mon, 13 May 2019 18:06:45 +0100
Subject: Make PRODUCT_CHARACTERISTICS a single-valued variable

Values should be comma-separated, and things won't go down well
if there are multiple words in this variable.

Bug: 123783710
Test: Put this in product_config.mk and ran multiproduct_kati:
      ifneq (1,$(words $(PRODUCT_CHARACTERISTICS)))
        $(error oops)
      endif
Change-Id: I5627f416093d68d8d19916a914739686b74d392f
---
 core/product.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/product.mk b/core/product.mk
index 1a566f7d7d..838673cd2e 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -162,7 +162,9 @@ _product_list_vars += PRODUCT_PRODUCT_PROPERTIES
 # used for adding properties to build.prop of product partition
 _product_list_vars += PRODUCT_PRODUCT_SERVICES_PROPERTIES
 _product_list_vars += PRODUCT_ODM_PROPERTIES
-_product_list_vars += PRODUCT_CHARACTERISTICS
+
+# The characteristics of the product, which among other things is passed to aapt
+_product_single_value_vars += PRODUCT_CHARACTERISTICS
 
 # A list of words like <source path>:<destination path>[:<owner>].
 # The file at the source path should be copied to the destination path
-- 
cgit v1.2.3-59-g8ed1b