Commit 833d054c authored Sep 15, 2023 by Yu Liu Committed by Automerger Merge Worker Sep 15, 2023

Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set"...

Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: fc68cf4d am: 7b09b7c6 am: d42b9ba0

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

Change-Id: I7e85188e140700bf4b764a03769f2622c24aae8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/soong_config.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -312,7 +312,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_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)))