Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: fc68cf4d45
Original change: https://android-review.googlesource.com/c/platform/build/+/2745809 Change-Id: I096473fdcf27348d39e2b24031faec2c6c2cf0c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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)))
|
||||
|
Reference in New Issue
Block a user