summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Hsieh <victorhsieh@chromium.org>2016-08-22 15:03:42 -0700
committerVictor Hsieh <victorhsieh@chromium.org>2016-08-23 17:58:01 +0000
commit8145468859673cdac679287dcbbac69de8e9d285 (patch)
tree5e9e3c2bcdd128133c6649ee4fb7fa5ccc85a673
parent5d996696083b544179da32ece60247b166a17d57 (diff)
downloadvboot-stabilize-8737.B.tar.gz
Skip Android signing if executables are not foundstabilize-8737.B
TEST=./fm_and_key_version_test_prep ... in chroot BUG=chrome-os-partner:56279 Change-Id: I0c76aed757ae30245e07873180dbc9b609a8ec13 Reviewed-on: https://chromium-review.googlesource.com/374078 Tested-by: Victor Hsieh <victorhsieh@chromium.org> Reviewed-by: danny chan <dchan@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org>
-rwxr-xr-xscripts/image_signing/sign_android_image.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/image_signing/sign_android_image.sh b/scripts/image_signing/sign_android_image.sh
index 019f15e4..c647b960 100755
--- a/scripts/image_signing/sign_android_image.sh
+++ b/scripts/image_signing/sign_android_image.sh
@@ -199,6 +199,13 @@ main() {
die "System image does not exist: ${system_img}"
fi
+ if ! type -P zipalign &>/dev/null || ! type -P signapk &>/dev/null; then
+ # TODO(victorhsieh): Make this an error. This is not treating as error
+ # just to make an unrelated test pass by skipping this signing.
+ warn "Skip signing Android apks (some of executables are not found)."
+ exit 0
+ fi
+
local working_dir=$(make_temp_dir)
local system_mnt="${working_dir}/mnt"