Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: fc68cf4d45 am: 7b09b7c614

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

Change-Id: I49ff58524f42faf34d4758708ca615db69836b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu Liu
2023-09-15 17:27:13 +00:00
committed by Automerger Merge Worker

View File

@@ -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)))