Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 286463c9 authored by Yu Liu's avatar Yu Liu Committed by Automerger Merge Worker
Browse files

Merge "Handle the case where the release value set is a list." into main am: 82ae7138 

Original change: https://android-review.googlesource.com/c/platform/build/+/2787016



Change-Id: I193e427194c50bc7565d7659164404aba28a4902
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09239676 82ae7138

core/soong_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,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))