Snap for 10447354 from 84de222e9a28ff781de9f4b3d4cd80369c01270d to mainline-wifi-release
Change-Id: I68dcae84868e12fd8adcd9377fd8c31a1f83cbd7
diff --git a/avd/add_avd_img.sh b/avd/add_avd_img.sh
index 06d9518..b1810ab 100755
--- a/avd/add_avd_img.sh
+++ b/avd/add_avd_img.sh
@@ -72,8 +72,8 @@
fi
ABI=$(ls $AVD_DIR)
-if [[ $ABI != "x86" && $ABI != "x86_64" ]]; then
- echo "ERROR: AVD image zip file format incorrect as $AVD_DIR should contain x86\ or x86_64\ as: https://source.android.com/devices/automotive/start/avd#pack-an-avd-image-zip-file "
+if [[ $ABI != "x86" && $ABI != "x86_64" && $ABI != "arm64" && $ABI != "arm64-v8a" ]]; then
+ echo "ERROR: AVD image zip file format incorrect as $AVD_DIR should contain x86, x86_64, arm64 or arm64-v8a as: https://source.android.com/devices/automotive/start/avd#pack-an-avd-image-zip-file "
exit
fi
echo "ABI=$ABI"
diff --git a/avd/create_avd.sh b/avd/create_avd.sh
index 64e9da5..87b1062 100755
--- a/avd/create_avd.sh
+++ b/avd/create_avd.sh
@@ -84,8 +84,8 @@
fi
ABI=$(ls "${AVD_IMG_DIR}")
-if [[ "${ABI}" != "x86" && "${ABI}" != "x86_64" ]]; then
- echo "ERROR: AVD image zip file format incorrect as ${AVD_DIR} should contain x86 or x86_64 as: https://source.android.com/devices/automotive/start/avd#pack-an-avd-image-zip-file "
+if [[ "${ABI}" != "x86" && "${ABI}" != "x86_64" && "${ABI}" != "arm64" && "${ABI}" != "arm64-v8a" ]]; then
+ echo "ERROR: AVD image zip file format incorrect as ${AVD_DIR} should contain x86, x86_64, arm64 or arm64-v8a as: https://source.android.com/devices/automotive/start/avd#pack-an-avd-image-zip-file "
exit
fi
echo "ABI=${ABI}"
@@ -154,6 +154,12 @@
exportVar "HEAP" "576"
exportVar "DATA" "6G"
+if [[ "${ABI}" == "arm64-v8a" ]]; then
+ HW_ARCH="arm64"
+else
+ HW_ARCH=${ABI}
+fi
+
echo "avd.ini.encoding=UTF-8
AvdId=${AVD_NAME}
avd.ini.displayname=${AVD_NAME}
@@ -164,7 +170,7 @@
hw.arc=false
hw.device.manufacturer=${MANUFACTURER}
hw.device.name=${DEVICE_PROFILE_NAME}
-hw.cpu.arch=${ABI}
+hw.cpu.arch=${HW_ARCH}
hw.cpu.ncore=${NCORE}
hw.gpu.enabled=yes
hw.gpu.mode=auto
