commit 10eac08fe1b6c70bf284cb78c013b1d566a40ac1
author Kelvin Zhang <zhangkelvin@google.com> Thu Jun 10 14:32:19 2021 -0400
committer Kelvin Zhang <zhangkelvin@google.com> Mon Jun 14 10:23:14 2021 -0400
tree 09d9a86cc6ca5fc266a69d5abde46d35245caeb9
parent 9c17b26ee75a2fc43f0988e70aa44c63fcba594a

Add ro.vendor.build.dont_use_vabc to disable VABC OTA

This prop is owned by OEM, OEM can set this if they want to disable
VABC.

Test: m dist, make sure generated OTA has VABC disabled
Bug: 185400304

Change-Id: Iceb2fb1f399d38a51722352a86ddf68af05fa24e

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index e8c1ef9..401fb04 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -311,6 +311,13 @@
 endif
 endif
 
+# Set build prop. This prop is read by ota_from_target_files when generating OTA,
+# to decide if VABC should be disabled.
+ifeq ($(BOARD_DONT_USE_VABC_OTA),true)
+ADDITIONAL_VENDOR_PROPERTIES += \
+    ro.vendor.build.dont_use_vabc=true
+endif
+
 # Set the flag in vendor. So VTS would know if the new fingerprint format is in use when
 # the system images are replaced by GSI.
 ifeq ($(BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT),true)