More android dev

.local/bin/setup/setupandroid

@@ -8,14 +8,7 @@ yay -S --noconfirm --needed \
     android-sdk-platform-tools \
     android-platform
 
-ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip"
-ANDROID_BUILD_TOOLS_VERSION=30.0.3
-ANT_HOME="/usr/share/ant"
-MAVEN_HOME="/usr/share/maven"
-GRADLE_HOME="/usr/share/gradle"
-ANDROID_SDK_ROOT="/opt/android"
-JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"
-PATH="$PATH:$ANDROID_SDK_ROOT/cmdline-tools/bin:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$ANT_HOME/bin:$MAVEN_HOME/bin:$GRADLE_HOME/bin"
+ANDROID_SDK_ROOT="/opt/android-sdk"
 
 mkdir "$HOME/.local/share/android" && touch "$HOME/.local/share/android/repositories.cfg" && \
     while true; do echo 'y'; sleep 2; done | doas sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platforms;android-30" && \
@@ -34,9 +27,9 @@ newgrp android-sdk
 
 avdmanager -v create avd -n main -k "system-images;android-30;google_apis;x86_64" --device "pixel_xl"
 
-# doas pacman --noconfirm -S nodejs
+doas pacman --noconfirm -S nodejs
 
-# npm install -g yarn 
+npm install -g yarn 
 
 yarn global require nativescript
 

.local/bin/teardown/teardownandroid

@@ -0,0 +1,21 @@
+#! /bin/bash
+
+avdmanager -v delete avd -n main
+
+doas pacman --noconfirm -Rns jdk-openjdk maven ant gradle wget
+
+yay -Rns --noconfirm --needed \
+    android-sdk-cmdline-tools-latest \
+    android-sdk-build-tools \
+    android-sdk-platform-tools \
+    android-platform
+
+[ -d /opt/android-sdk ] && sudo rm -rf /opt/android-sdk
+
+doas groupdel android-sdk
+
+yarn global remove nativescript
+
+[ -d "$HOME/.android" ] && sudo rm -rf "$HOME/.android"
+[ -d "$HOME/.local/share/android" ] && sudo rm -rf "$HOME/.local/share/android"
+