commit 7be7de45063136004a9ea27726c75a995cdd1570
author Victor Hsieh <victorhsieh@chromium.org> Tue Aug 16 13:13:47 2016 -0700
committer Victor Hsieh <victorhsieh@chromium.org> Tue Aug 16 21:02:11 2016 +0000
tree 2fe417780222f7e88a25c8e281b44d7e77719f3c
parent 59c4501d8ebe5c574205af0d16f5d4f63b3f9121

Only re-sign ARC apks when lsb-release looks legit

TEST=sign_official_build.sh with veyron_minnie image  # works
TEST=sign_official_build.sh with veyron_shark image  # skipped
BUG=chromium:638289

Change-Id: Ic00b5c73fc094ad1146ffb1f29d2dcc5cfdb839d
Reviewed-on: https://chromium-review.googlesource.com/371458
Tested-by: Victor Hsieh <victorhsieh@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/image_signing/sign_official_build.sh

diff --git a/scripts/image_signing/sign_official_build.sh b/scripts/image_signing/sign_official_build.sh
index 173dd6b..f365488 100755
--- a/scripts/image_signing/sign_official_build.sh
+++ b/scripts/image_signing/sign_official_build.sh
@@ -598,9 +598,10 @@
   mount_image_partition "${image}" 3 "${rootfs_dir}"
 
   local system_img="${rootfs_dir}/opt/google/containers/android/system.raw.img"
-
-  if [[ ! -e "${system_img}" ]]; then
-    info "Android image not found.  Not signing Android APKs."
+  local arc_version=$(grep CHROMEOS_ARC_VERSION= \
+    "${rootfs_dir}/etc/lsb-release" | cut -d= -f2)
+  if [[ ! -e "${system_img}" || -z "${arc_version}" ]]; then
+    info "ARC image not found.  Not signing Android APKs."
     sudo umount "${rootfs_dir}"
     return
   fi