Android build fixes

Author: alarixnia

build-android.sh

@@ -1,8 +1,16 @@
-#!/bin/bash
+#!/bin/sh
 #First, you should probably install Android SDK and Android NDK. 
 #You can likely install Android files with apt: sudo apt install android-sdk-build-tools android-sdk 
 #You may have to manually download Android commandline-tools and Android NDK and extract them.
-export ANDROID_HOME="/home/$USER/android/"
-export ANDROID_NDK_HOME="/home/$USER/android/android-ndk-r24"
+if [ -e /usr/lib/android-sdk ]; then
+	export ANDROID_HOME=/usr/lib/android-sdk
+	if ! [ -e /usr/lib/android-sdk/licenses/google-sdk-license ]; ten
+		git clone https://github.com/Shadowstyler/android-sdk-licenses.git
+		sudo cp -p android-sdk-licenses/*-license /usr/lib/android-sdk/licenses
+	fi
+else
+	export ANDROID_HOME="/home/$USER/android/"
+	export ANDROID_NDK_HOME="/home/$USER/android/android-ndk-r24"
+fi
 cd org.scape2003.mudclient/
-./gradlew assembleDebug
+./gradlew assembleDebug

org.scape2003.mudclient/app/build.gradle

@@ -21,7 +21,7 @@ android {
             ndkBuild {
                 arguments "APP_PLATFORM=android-19"
                 abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-                cFlags "-Ofast -DRENDER_SW -DREVISION_177"
+                cFlags "-Ofast -DRENDER_SW -DSDL2"
             }
         }
     }

org.scape2003.mudclient/app/jni/src/Android.mk

@@ -10,7 +10,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include
 
 # Add your application source files here...
 # glob didn't work :(
-LOCAL_SRC_FILES := src/chat-message.c src/custom/clarify-herblaw-items.c src/custom/diverse-npcs.c src/custom/item-highlight.c src/game-character.c src/game-data.c src/game-model.c src/lib/bn.c src/lib/bzip.c src/lib/ini.c src/lib/isaac.c src/mudclient.c src/options.c src/packet-handler.c src/packet-stream.c src/panel.c src/polygon.c src/scene.c src/surface.c src/ui/additional-options.c src/ui/appearance.c src/ui/bank.c src/ui/combat-style.c src/ui/confirm.c src/ui/duel.c src/ui/experience-drops.c src/ui/inventory-tab.c src/ui/login.c src/ui/logout.c src/ui/lost-connection.c src/ui/magic-tab.c src/ui/menu.c src/ui/message-tabs.c src/ui/minimap-tab.c src/ui/offer-x.c src/ui/option-menu.c src/ui/options-tab.c src/ui/server-message.c src/ui/shop.c src/ui/sleep.c src/ui/social-tab.c src/ui/stats-tab.c src/ui/status-bars.c src/ui/trade.c src/ui/transaction.c src/ui/ui-tabs.c src/ui/welcome.c src/ui/wilderness-warning.c src/utility.c src/world.c
+LOCAL_SRC_FILES := src/chat-message.c src/custom/clarify-herblaw-items.c src/custom/diverse-npcs.c src/custom/item-highlight.c src/game-character.c src/game-data.c src/game-model.c src/lib/bn.c src/lib/bzip.c src/lib/ini.c src/lib/isaac.c src/mudclient.c src/mudclient-sdl.c src/mudclient-sdl2.c src/options.c src/packet-handler.c src/packet-stream.c src/panel.c src/polygon.c src/scene.c src/surface.c src/ui/additional-options.c src/ui/appearance.c src/ui/bank.c src/ui/combat-style.c src/ui/confirm.c src/ui/duel.c src/ui/experience-drops.c src/ui/inventory-tab.c src/ui/login.c src/ui/logout.c src/ui/lost-connection.c src/ui/magic-tab.c src/ui/menu.c src/ui/message-tabs.c src/ui/minimap-tab.c src/ui/offer-x.c src/ui/option-menu.c src/ui/options-tab.c src/ui/server-message.c src/ui/shop.c src/ui/sleep.c src/ui/social-tab.c src/ui/stats-tab.c src/ui/status-bars.c src/ui/trade.c src/ui/transaction.c src/ui/ui-tabs.c src/ui/welcome.c src/ui/wilderness-warning.c src/ui/worldlist.c src/utility.c src/world.c src/lib/rsa/rsa-tiny.c
 
 LOCAL_SHARED_LIBRARIES := SDL2