commit c75e6917b1a1233d08f62f9876e2f4c172537e36
author Saswat Padhi <spadhi@chromium.org> Thu Nov 28 07:28:23 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 28 07:28:23 2024 +0000
tree 7567a9332ae32ca7982714f5de5fb1b0d2fa5a00
parent 0a3e168a92523083d2ed572b374daf4ed1a4e725
parent 6d01b434783596c5c3d1d045e08bd0ab69467cba

Merge "build/debian: Leave an open shell if build_in_container.sh fails" into main am: 6d01b43478

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3381186

Change-Id: I750b8cd8ad312771138fcc88e76eb27f2efe1a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

build/debian/build_in_container.sh

diff --git a/build/debian/build_in_container.sh b/build/debian/build_in_container.sh
index d5680e0..ef64254 100755
--- a/build/debian/build_in_container.sh
+++ b/build/debian/build_in_container.sh
@@ -23,6 +23,8 @@
   esac
 done
 
-docker run --privileged -it --workdir /root/Virtualization/build/debian -v \
-  "$ANDROID_BUILD_TOP/packages/modules/Virtualization:/root/Virtualization" -v \
-  /dev:/dev ubuntu:22.04 /root/Virtualization/build/debian/build.sh -a "$arch" $release_flag
+docker run --privileged -it -v /dev:/dev \
+  -v "$ANDROID_BUILD_TOP/packages/modules/Virtualization:/root/Virtualization" \
+  --workdir /root/Virtualization/build/debian \
+  ubuntu:22.04 \
+  bash -c "/root/Virtualization/build/debian/build.sh -a "$arch" $release_flag || bash"