diff options
| author | Anton Hansson <hansson@google.com> | 2019-05-13 18:06:45 +0100 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2019-05-13 18:15:32 +0100 |
| commit | 879b007555b3cb565fd73e71d3823a08e8e8a067 (patch) | |
| tree | 829ec7745be582dff847a762d303832a4a4f3c5f | |
| parent | 738b9963d5dbfd58e8e7f266f43c1504dc523114 (diff) | |
| download | build-879b007555b3cb565fd73e71d3823a08e8e8a067.tar.gz | |
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
| -rw-r--r-- | core/product.mk | 4 |
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 |