Skip merge sequence and COW computation if VABC disabled am: 0a52f1b9a9 am: 663719437a am: 91c6f3bc84
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1564914
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia400069f9719ee42d1e87f29daad3da2f79a859e
diff --git a/scripts/brillo_update_payload b/scripts/brillo_update_payload
index 1e729bd..e50618f 100755
--- a/scripts/brillo_update_payload
+++ b/scripts/brillo_update_payload
@@ -89,12 +89,14 @@
exit 1
}
-# Loads shflags. We first look at the default install location; then look for
-# crosutils (chroot); finally check our own directory.
+# Loads shflags. We first look at the default install location; then our own
+# directory; finally the parent directory.
load_shflags() {
local my_dir="$(dirname "$(readlink -f "$0")")"
local path
- for path in /usr/share/misc "${my_dir}"/lib/shflags; do
+ for path in /usr/share/misc \
+ "${my_dir}"/lib/shflags \
+ "${my_dir}"/../lib/shflags; do
if [[ -r "${path}/shflags" ]]; then
. "${path}/shflags" || die "Could not load ${path}/shflags."
return