From 7be7de45063136004a9ea27726c75a995cdd1570 Mon Sep 17 00:00:00 2001 From: Victor Hsieh Date: Tue, 16 Aug 2016 13:13:47 -0700 Subject: 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 Reviewed-by: Mike Frysinger --- scripts/image_signing/sign_official_build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/image_signing/sign_official_build.sh b/scripts/image_signing/sign_official_build.sh index 173dd6b5..f365488d 100755 --- a/scripts/image_signing/sign_official_build.sh +++ b/scripts/image_signing/sign_official_build.sh @@ -598,9 +598,10 @@ resign_android_image_if_exists() { 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 -- cgit v1.2.1