commit 82ae713895abcef187b0934d6c34e5b3de65318b
author Yu Liu <yudiliu@google.com> Sat Oct 14 03:27:30 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 14 03:27:30 2023 +0000
tree a80238c04a3dd0633737743841d7732c0dbcf3c4
parent 7f8c43c1f44e6a048754aaae071791e6ac689e94
parent 6ff41107ddb63aac1c2153480c6bdfcd8ffb8f35

Merge "Handle the case where the release value set is a list." into main

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 97c50cd..f68c741 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -314,7 +314,7 @@
 $(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))