fix sdk detection

wysaid · Jan 16, 2023 · 1803aae · 1803aae
1 parent 0328b4b
commit 1803aae
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/vscode_tasks.sh b/vscode_tasks.sh
@@ -88,10 +88,16 @@ function buildProject() {
 }
 
 if [[ ! -f "local.properties" ]]; then
-    if [[ -n "$ANDROID_SDK_HOME" ]]; then
-        echo "sdk.dir=$ANDROID_SDK_HOME" >>local.properties
+    if [[ -n "$ANDROID_HOME" ]]; then
+        echo "sdk.dir=$ANDROID_HOME" >>local.properties
     elif [[ -n "$ANDROID_SDK_ROOT" ]]; then
         echo "sdk.dir=$ANDROID_SDK_ROOT" >>local.properties
+    elif [[ -n "$ANDROID_SDK_HOME" ]]; then
+        if [[ -d "$ANDROID_SDK_HOME/platform-tools" ]]; then
+            echo "sdk.dir=$ANDROID_SDK_HOME" >>local.properties
+        elif [[ -d "$ANDROID_SDK_HOME/../platform-tools" ]]; then
+            echo "sdk.dir=$(realpath $ANDROID_SDK_HOME/../platform-tools)" >>local.properties
+        fi
     elif [[ -n "$ANDROID_SDK" ]]; then
         echo "sdk.dir=$ANDROID_SDK" >>local.properties
     else