commit 413982e4450453ed458e525f47df2c43a1855aca
author Kelvin Zhang <zhangkelvin@google.com> Tue Mar 02 15:34:50 2021 -0500
committer Kelvin Zhang <zhangkelvin@google.com> Wed Mar 10 13:43:03 2021 +0000
tree 67ae300574d4ec08380dd5e170da1e659a587a6e
parent 0e1c7fd2729c9de9ae10abe96eb41a35285eada5

Allow disable_vabc flag in full OTA

Previously, brillo_update_payload only honors --disable_vabc flag for
incremental OTA. Respect this flag for full OTA as well.

Test: Generate a full OTA with --disable_vabc
Change-Id: Ic18dfdffd3e43ab139d1ea0704679ea38dd082c2

scripts/brillo_update_payload

diff --git a/scripts/brillo_update_payload b/scripts/brillo_update_payload
index c510148..d1a1781 100755
--- a/scripts/brillo_update_payload
+++ b/scripts/brillo_update_payload
@@ -706,10 +706,11 @@
       GENERATOR_ARGS+=(
         --disable_verity_computation="${FLAGS_disable_verity_computation}" )
     fi
-    if [[ -n "${FLAGS_disable_vabc}" ]]; then
-      GENERATOR_ARGS+=(
-        --disable_vabc="${FLAGS_disable_vabc}" )
-    fi
+  fi
+
+  if [[ -n "${FLAGS_disable_vabc}" ]]; then
+    GENERATOR_ARGS+=(
+      --disable_vabc="${FLAGS_disable_vabc}" )
   fi
 
   # minor version is set only for delta or partial payload.