From 6ff41107ddb63aac1c2153480c6bdfcd8ffb8f35 Mon Sep 17 00:00:00 2001 From: Yu Liu Date: Thu, 12 Oct 2023 20:36:41 -0700 Subject: [PATCH] Handle the case where the release value set is a list. Bug: 304814040 Test: CI, unit test, b build build/make/tools/aconfig:aconfig.test.cpp b test build/make/tools/aconfig:AconfigJavaHostTest Change-Id: Ie9063a6c0bd08f96e0593bad8cb731d826b25fea --- core/soong_config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/soong_config.mk b/core/soong_config.mk index e541c123df..45e43f344f 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -313,7 +313,7 @@ $(call add_json_str, ProductBrand, $(PRODUCT_BRAND)) $(call add_json_list, BuildVersionTags, $(BUILD_VERSION_TAGS)) $(call add_json_str, ReleaseVersion, $(_RELEASE_VERSION)) -$(call add_json_str, ReleaseAconfigValueSets, $(RELEASE_ACONFIG_VALUE_SETS)) +$(call add_json_list, ReleaseAconfigValueSets, $(RELEASE_ACONFIG_VALUE_SETS)) $(call add_json_str, ReleaseAconfigFlagDefaultPermission, $(RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION)) $(call add_json_bool, ReleaseDefaultModuleBuildFromSource, $(RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE))