diff options
| author | Gabriel Russell <gabriel.russell@mongodb.com> | 2018-06-14 10:27:17 -0400 |
|---|---|---|
| committer | Gabriel Russell <gabriel.russell@mongodb.com> | 2018-06-14 15:02:28 -0400 |
| commit | 13c65fa47bc60b785bc9c6a90bd68d5167c34ba7 (patch) | |
| tree | 3e0042f8eae74ba1576b9ba10d1d14b6061d1619 /buildscripts/runandroidsim.sh | |
| parent | a9ad37bdea390cbf96122382e3a358287b86ac2f (diff) | |
| download | mongo-13c65fa47bc60b785bc9c6a90bd68d5167c34ba7.tar.gz | |
SERVER-34006 build android embedded with api version 21
Diffstat (limited to 'buildscripts/runandroidsim.sh')
| -rwxr-xr-x | buildscripts/runandroidsim.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/buildscripts/runandroidsim.sh b/buildscripts/runandroidsim.sh index 458cd93c2f8..1efb9e2aabd 100755 --- a/buildscripts/runandroidsim.sh +++ b/buildscripts/runandroidsim.sh @@ -1,8 +1,8 @@ #!/bin/sh -if [ "$#" -lt "4" ]; then +if [ "$#" -lt "5" ]; then echo "usage:" - echo "$0 <android-sdk-path> <sysarch> <directory> <test-path-in-directory>" + echo "$0 <android-sdk-path> <sysarch> <image-api-version> <directory> <test-path-in-directory>" exit 1 fi @@ -13,6 +13,8 @@ ANDROID_SDK=$1 shift ANDROID_SYSTEM_IMAGE_ARCH=$1 shift +ANDROID_IMAGE_API_VERSION=$1 +shift DIRECTORY=$1 shift TEST_PATH_IN_DIRECTORY=$1 @@ -40,12 +42,12 @@ cleanup() { } echo "Creating Android virtual device" -echo no | $ANDROID_SDK/tools/bin/avdmanager create avd --force -k "system-images;android-24;google_apis;$ANDROID_SYSTEM_IMAGE_ARCH" --name android_avd --abi google_apis/$ANDROID_SYSTEM_IMAGE_ARCH -p android_avd +echo no | $ANDROID_SDK/tools/bin/avdmanager create avd --force -k "system-images;android-$ANDROID_IMAGE_API_VERSION;google_apis;$ANDROID_SYSTEM_IMAGE_ARCH" --name android_avd --abi google_apis/$ANDROID_SYSTEM_IMAGE_ARCH -p android_avd trap 'cleanup $?' INT TERM EXIT echo "Starting the virtual device on the emulator" -$ANDROID_SDK/emulator/emulator @android_avd -no-window -no-audio & +$ANDROID_SDK/emulator/emulator @android_avd -no-window -no-audio -no-accel & EMULATOR_PID=$! echo "Waiting for the adb service to be ready for commands" |