commit d793c271c32470910e49d8e511ca2928368c7051
author Yu Liu <yudiliu@google.com> Mon Sep 11 10:57:16 2023 -0700
committer Yu Liu <yudiliu@google.com> Mon Sep 11 10:57:16 2023 -0700
tree 0ad0a52cab451dd14b546635de3c05dd4952a9dd
parent 420f6978ca19b7fed15e630383eeb9e6aeec7a80

Support aconfig_declarations, aconfig_values and aconfig_value_set

Bug: 297356603
Test: Unit tests
Change-Id: Iefa0e056cd6185499ffa92492b261c31a5d27af2

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 73f4f82..f004c00 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -311,7 +311,7 @@
 $(call add_json_list, BuildVersionTags,    $(BUILD_VERSION_TAGS))
 
 $(call add_json_str, ReleaseVersion,    $(_RELEASE_VERSION))
-$(call add_json_list, ReleaseAconfigValueSets,    $(RELEASE_ACONFIG_VALUE_SETS))
+$(call add_json_str, ReleaseAconfigValueSets,    $(RELEASE_ACONFIG_VALUE_SETS))
 $(call add_json_str, ReleaseAconfigFlagDefaultPermission,    $(RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION))
 
 $(call add_json_bool, KeepVndk, $(filter true,$(KEEP_VNDK)))