Regenerate checked-in update_metadata_pb2.py with aprotoc am: f650fa4194 am: 8f18403631 am: c7fefdb39c
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1566586
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If26f8d75be34b4a2b07392803325820864a484ff
diff --git a/scripts/brillo_update_payload b/scripts/brillo_update_payload
index 4ff4893..619f49b 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