From 4be8ba34d6341a0ffa3e1166862cd1d976365165 Mon Sep 17 00:00:00 2001 From: Victor Gaydov Date: Sat, 13 May 2023 20:37:05 +0400 Subject: [PATCH] Cleanup in scripts - set default API level to 26 (same as minSdkVersion in gradle) - use curly braces --- scripts/android/start_emulator.sh | 4 ++-- scripts/android_docker.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/android/start_emulator.sh b/scripts/android/start_emulator.sh index 8c7c372a..9e005c4a 100755 --- a/scripts/android/start_emulator.sh +++ b/scripts/android/start_emulator.sh @@ -2,8 +2,8 @@ set -euxo pipefail -export PATH="$ANDROID_SDK_ROOT/tools/bin:${PATH}" -export PATH="$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:${PATH}" +export PATH="${ANDROID_SDK_ROOT}/tools/bin:${PATH}" +export PATH="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${PATH}" # create avd if it doesn't exist if ! avdmanager list avd -c | grep -qF roc_device diff --git a/scripts/android_docker.sh b/scripts/android_docker.sh index a7fb2f61..e42eeab4 100755 --- a/scripts/android_docker.sh +++ b/scripts/android_docker.sh @@ -9,7 +9,7 @@ function run_cmd() { # setup default values : "${JAVA_VERSION:=8}" -: "${API:=28}" +: "${API:=26}" : "${NDK_VERSION:=21.1.6352462}" : "${BUILD_TOOLS_VERSION:=28.0.3}" : "${CMAKE_VERSION:=3.10.2.4988404}"