From 198932aa93fcc5da3aa5c859077fbb076a1282be Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Sat, 30 Jan 2021 08:57:41 +1100
Subject: [PATCH] Get it partially working on Android 3.0

---
 misc/buildbot_android.sh | 8 +++++---
 src/Drawer2D.c           | 9 +++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/misc/buildbot_android.sh b/misc/buildbot_android.sh
index a380cdbff..b84064a00 100644
--- a/misc/buildbot_android.sh
+++ b/misc/buildbot_android.sh
@@ -1,16 +1,16 @@
 FLAGS="-fPIC -shared -s -O1 -fvisibility=hidden -rdynamic"
-LIBS="-lGLESv2 -lEGL -lOpenSLES -lm -landroid -llog"
+LIBS="-lGLESv2 -lEGL -lm -landroid -llog"
 NDK_ROOT="/home/buildbot/android/android-ndk-r22/toolchains/llvm/prebuilt/linux-x86_64/bin"
 TOOLS_ROOT="/home/buildbot/android/sdk/build-tools/26.0.0"
 SDK_ROOT="/home/buildbot/android/sdk/platforms/android-26"
 
 cd /home/buildbot/client/src
+$NDK_ROOT/armv7a-linux-androideabi16-clang *.c $FLAGS -march=armv5 $LIBS -o cc-droid-arm_16
 $NDK_ROOT/armv7a-linux-androideabi16-clang *.c $FLAGS $LIBS -o cc-droid-arm_32
 $NDK_ROOT/aarch64-linux-android21-clang *.c $FLAGS $LIBS -o cc-droid-arm_64
 $NDK_ROOT/i686-linux-android16-clang *.c $FLAGS $LIBS -o cc-droid-x86_32
 $NDK_ROOT/x86_64-linux-android21-clang *.c $FLAGS $LIBS -o cc-droid-x86_64
 
-
 cd ../android/app/src/main
 # remove old java temp files
 rm -rf obj
@@ -20,10 +20,12 @@ rm classes.dex
 # copy required native libraries
 rm -rf lib
 mkdir lib
+mkdir lib/armeabi
 mkdir lib/armeabi-v7a
 mkdir lib/arm64-v8a
 mkdir lib/x86
 mkdir lib/x86_64
+cp ~/client/src/cc-droid-arm_16 lib/armeabi/libclassicube.so
 cp ~/client/src/cc-droid-arm_32 lib/armeabi-v7a/libclassicube.so
 cp ~/client/src/cc-droid-arm_64 lib/arm64-v8a/libclassicube.so
 cp ~/client/src/cc-droid-x86_32 lib/x86/libclassicube.so
@@ -44,7 +46,7 @@ $TOOLS_ROOT/dx --dex --output=obj/classes.dex ./obj
 $TOOLS_ROOT/aapt package -f -M AndroidManifest.xml -S res -F obj/cc-unsigned.apk -I $SDK_ROOT/android.jar
 # and add all the required files
 cp obj/classes.dex classes.dex
-$TOOLS_ROOT/aapt add -f obj/cc-unsigned.apk classes.dex lib/armeabi-v7a/libclassicube.so lib/arm64-v8a/libclassicube.so lib/x86/libclassicube.so lib/x86_64/libclassicube.so
+$TOOLS_ROOT/aapt add -f obj/cc-unsigned.apk classes.dex lib/armeabi/libclassicube.so lib/armeabi-v7a/libclassicube.so lib/arm64-v8a/libclassicube.so lib/x86/libclassicube.so lib/x86_64/libclassicube.so
 # sign the apk with debug key (https://stackoverflow.com/questions/16711233/)
 cp obj/cc-unsigned.apk obj/cc-signed.apk
 jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore debug.keystore -storepass android -keypass android obj/cc-signed.apk androiddebugkey
diff --git a/src/Drawer2D.c b/src/Drawer2D.c
index c0bdda8fb..8487e1ee4 100644
--- a/src/Drawer2D.c
+++ b/src/Drawer2D.c
@@ -36,7 +36,7 @@ void DrawTextArgs_MakeEmpty(struct DrawTextArgs* args, struct FontDesc* font, cc
 *-----------------------------------------------------Font functions------------------------------------------------------*
 *#########################################################################################################################*/
 static char defaultBuffer[STRING_SIZE];
-static cc_string font_candidates[11] = {
+static cc_string font_candidates[12] = {
 	String_FromArray(defaultBuffer),     /* Filled in with user's default font */
 	String_FromConst("Arial"),           /* preferred font on all platforms */
 	String_FromConst("Liberation Sans"), /* nice looking fallbacks for linux */
@@ -45,9 +45,10 @@ static cc_string font_candidates[11] = {
 	String_FromConst("Cantarell"),
 	String_FromConst("DejaVu Sans Book"), 
 	String_FromConst("Century Schoolbook L Roman"), /* commonly available on linux */
-	String_FromConst("Slate For OnePlus"), /* android 10, some devices */
-	String_FromConst("Roboto"), /* android (broken on some android 10 devices) */
-	String_FromConst("Geneva") /* for ancient macOS versions */
+	String_FromConst("Slate For OnePlus"), /* Android 10, some devices */
+	String_FromConst("Roboto"), /* Android (broken on some Android 10 devices) */
+	String_FromConst("Geneva"), /* for ancient macOS versions */
+	String_FromConst("Droid Sans") /* for old Android versions */
 };
 
 void Drawer2D_SetDefaultFont(const cc_string* fontName) {