commit 9afdf0f2fb10c0eabb10f63756055ee30f242467
author George Engelbrecht <engeg@google.com> Mon Nov 27 14:52:18 2023 -0700
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Nov 29 16:06:25 2023 +0000
tree 142967c6793221f310a5eb0edc2f738a64b4e17d
parent ba7fd22d3dd659b3ab42ad66f22169a6ce0f4dfe

sign_official_build.sh: stop messing with +x

BUG=chromium:1141907
TEST=local

Change-Id: I3079ce655a616236ba973383fa0115bce3800a10
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/5062276
Auto-Submit: George Engelbrecht <engeg@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: George Engelbrecht <engeg@google.com>
Commit-Queue: George Engelbrecht <engeg@google.com>

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 093182a..e0edb81 100755
--- a/scripts/image_signing/sign_official_build.sh
+++ b/scripts/image_signing/sign_official_build.sh
@@ -775,19 +775,15 @@
   fi
 
   info "Found ARC image version '${arc_version}', re-signing APKs."
-  # TODO(crbug.com/1141907): remove set -x and set +x below.
-  set -x
   "${SCRIPT_DIR}/sign_android_image.sh" "${rootfs_dir}" "${KEY_DIR}/android"
 
   if ! sudo umount "${rootfs_dir}"; then
     error "umount ${rootfs_dir} failed"
     sudo lsof -n "${rootfs_dir}"
     ps auxf
-    set +x
     return 1
   fi
   info "Re-signed Android image"
-  set +x
 }
 
 # Check whether the image's board is reven or not.