Look for shflags in parent dir of brillo_update_payload's dir.
Android host tools binaries are under $HOST_OUT/bin and libs are under
$HOST_OUT/lib. So 'lib' dir is sibling of 'bin' dir and not under it.
Bug: 168477594
Test: treehugger
Change-Id: I67d49f243b06bae9c4d4e4afe2a6bb922a1ea31a
diff --git a/scripts/brillo_update_payload b/scripts/brillo_update_payload
index 3bc87bd..77d372c 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