Merge "Use vm_config.json of the correct architecture" into main am: 28e9201cb9 am: 02e0d370fb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3433482
Change-Id: Ifecb990fdc9742aa98a521e84ae2cc3d17e06e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/build/debian/build.sh b/build/debian/build.sh
index 613f7d2..3f33ec8 100755
--- a/build/debian/build.sh
+++ b/build/debian/build.sh
@@ -307,9 +307,10 @@
generate_output_package() {
fdisk -l "${raw_disk_image}"
- root_partition_num=1
- bios_partition_num=14
- efi_partition_num=15
+ local vm_config="$(realpath $(dirname "$0"))/vm_config.json.${arch}"
+ local root_partition_num=1
+ local bios_partition_num=14
+ local efi_partition_num=15
pushd ${workdir} > /dev/null
@@ -373,7 +374,6 @@
config_space=${debian_cloud_image}/config_space/${debian_version}
resources_dir=${debian_cloud_image}/src/debian_cloud_images/resources
arch="$(uname -m)"
-vm_config="$(realpath $(dirname "$0"))/vm_config.json.${arch}"
mode=debug
save_workdir=0
use_custom_kernel=0