Skip to content

Commit

Permalink
Vagrant: make Android dev box script more robust
Browse files Browse the repository at this point in the history
When the oor-dev-android box is shut down and then started up again,
running the SDK install script again fails at the creation of the AVD.
Force recreating it if the script is run, so that the script doesn't
fail and we get a clean environment.

Signed-off-by: Lorand Jakab <[email protected]>
  • Loading branch information
ljakab committed Apr 20, 2018
1 parent 158b37e commit 8aaa830
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion vagrant/install-android-sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ $ANDROID_SDK_ROOT/tools/bin/sdkmanager "build-tools;${BUILD_TOOLS_VERSION}"
echo "Downloading and installing Google APIs System Image for ${EMU_ABI} ABI"
$ANDROID_SDK_ROOT/tools/bin/sdkmanager "${ANDROID_SYSTEM_IMAGE}"
echo "Creating Nexus 5X API ${EMU_API} ${EMU_ABI} Android Virtual Device (AVD)"
$ANDROID_SDK_ROOT/tools/bin/avdmanager create avd --tag "${EMU_TAG}" --package "${ANDROID_SYSTEM_IMAGE}" --name "Nexus_5X_API_${EMU_API}_${EMU_ABI}" --abi $EMU_ABI --device "Nexus 5X"
$ANDROID_SDK_ROOT/tools/bin/avdmanager create avd --force --tag "${EMU_TAG}" --package "${ANDROID_SYSTEM_IMAGE}" --name "Nexus_5X_API_${EMU_API}_${EMU_ABI}" --abi $EMU_ABI --device "Nexus 5X"

# Install Android Emulator dependencies
sudo apt-get -y -q install libpulse0 libglu1-mesa
Expand Down

0 comments on commit 8aaa830

Please sign in to comment.