summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2019-05-14 15:36:06 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-05-14 15:36:06 +0000
commit87c470e127be8a0e37c522bb531b51ea65830fc5 (patch)
treeb2ceb63dcf7c5f56ebed284a527cf40adfa358e6
parentbc7e3f98f41108c03a06abbf98add08ad4a05040 (diff)
parent879b007555b3cb565fd73e71d3823a08e8e8a067 (diff)
Merge "Make PRODUCT_CHARACTERISTICS a single-valued variable"
-rw-r--r--core/product.mk4
1 files changed, 3 insertions, 1 deletions
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