summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2015-11-17 22:26:25 -0500
committerMike Frysinger <vapier@google.com>2015-11-24 14:34:15 -0500
commit37e5cc52e09d004dfe3f31d3eda25073eea3a239 (patch)
tree844f2ed3c89d317042299c9e924002e07c4eee63
parent55c70833a0c318cc9d874aa1de72d6aa56b954f4 (diff)
downloadbrillo-37e5cc52e09d004dfe3f31d3eda25073eea3a239.tar.gz
brilloemulator: exec qemu at the end
Currently the shell might stick around even though the qemu command is the last thing executed. It's a waste of resources, but also if you happen to edit the file while it's running, the shell parses the file in the middle when qemu exits. Just exec to avoid both issues. While we're here, standardize the notice message. Change-Id: I60f357d348a33b1e68d7fae31dadb10cdd6f4ee5
-rwxr-xr-xbrilloemulator_arm/base_product/qemu/brilloemulator-arm2
-rwxr-xr-xbrilloemulator_arm64/base_product/qemu/brilloemulator-arm642
-rwxr-xr-xbrilloemulator_x86/base_product/qemu/brilloemulator-x863
-rwxr-xr-xbrilloemulator_x86_64/base_product/qemu/brilloemulator-x86_643
4 files changed, 6 insertions, 4 deletions
diff --git a/brilloemulator_arm/base_product/qemu/brilloemulator-arm b/brilloemulator_arm/base_product/qemu/brilloemulator-arm
index ccdc4e5..cabe09b 100755
--- a/brilloemulator_arm/base_product/qemu/brilloemulator-arm
+++ b/brilloemulator_arm/base_product/qemu/brilloemulator-arm
@@ -38,7 +38,7 @@ while true ; do
done
echo Starting emulator with ${MEM}MB memory
-
+exec \
${ANDROID_BUILD_TOP}/prebuilts/android-emulator/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64 \
-M vexpress-a9 \
-m ${MEM}M \
diff --git a/brilloemulator_arm64/base_product/qemu/brilloemulator-arm64 b/brilloemulator_arm64/base_product/qemu/brilloemulator-arm64
index 6f13478..3a9dcb8 100755
--- a/brilloemulator_arm64/base_product/qemu/brilloemulator-arm64
+++ b/brilloemulator_arm64/base_product/qemu/brilloemulator-arm64
@@ -38,7 +38,7 @@ while true ; do
done
echo Starting emulator with ${MEM}MB memory
-
+exec \
${ANDROID_BUILD_TOP}/prebuilts/android-emulator/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64 \
-M virt \
-cpu cortex-a57 \
diff --git a/brilloemulator_x86/base_product/qemu/brilloemulator-x86 b/brilloemulator_x86/base_product/qemu/brilloemulator-x86
index b891fdc..a33667e 100755
--- a/brilloemulator_x86/base_product/qemu/brilloemulator-x86
+++ b/brilloemulator_x86/base_product/qemu/brilloemulator-x86
@@ -37,7 +37,8 @@ while true ; do
esac
done
-echo Starting Emulator with ${MEM}MB Memory
+echo Starting emulator with ${MEM}MB memory
+exec \
${ANDROID_BUILD_TOP}/prebuilts/android-emulator/linux-x86_64/qemu/linux-x86_64/qemu-system-i386 \
-m ${MEM}M \
-kernel ${ANDROID_BUILD_TOP}/out/target/product/brilloemulator_x86/kernel \
diff --git a/brilloemulator_x86_64/base_product/qemu/brilloemulator-x86_64 b/brilloemulator_x86_64/base_product/qemu/brilloemulator-x86_64
index 1cf6015..4ac08a5 100755
--- a/brilloemulator_x86_64/base_product/qemu/brilloemulator-x86_64
+++ b/brilloemulator_x86_64/base_product/qemu/brilloemulator-x86_64
@@ -37,7 +37,8 @@ while true ; do
esac
done
-echo Starting Emulator with ${MEM}MB Memory
+echo Starting emulator with ${MEM}MB memory
+exec \
${ANDROID_BUILD_TOP}/prebuilts/android-emulator/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64 \
-m ${MEM}M \
-kernel ${ANDROID_BUILD_TOP}/out/target/product/brilloemulator_x86_64/kernel \