From 1ea86d3305e4112e599780392b39a10c93676e42 Mon Sep 17 00:00:00 2001
From: Martin Felis <martin@fysx.org>
Date: Fri, 7 Dec 2018 17:24:32 +0100
Subject: [PATCH] Properly using SDL 2.0.9 paths and android 26 compatibility
 layers.

---
 app/build.gradle                                        | 6 +++---
 love/build.gradle                                       | 8 ++++----
 love/src/jni/love/Android.mk                            | 4 ++--
 love/src/main/java/org/love2d/android/GameActivity.java | 1 +
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 334fecb3..47d33e18 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
+    compileSdkVersion 26
     buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId "org.love2d.android"
         versionCode 26
         versionName "11.1"
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 26
     }
     buildTypes {
         release {
@@ -24,7 +24,7 @@ android {
 dependencies {
     api 'com.android.support:multidex:1.0.1'
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'com.android.support:appcompat-v7:22.2.0'
+    api 'com.android.support:appcompat-v7:26.1.0'
     api project(':love')
 }
 
diff --git a/love/build.gradle b/love/build.gradle
index 911728b4..fcb9b78f 100644
--- a/love/build.gradle
+++ b/love/build.gradle
@@ -6,11 +6,11 @@ android {
     // See https://code.google.com/p/android/issues/detail?id=52962
     // and http://stackoverflow.com/questions/27277433/why-does-gradle-build-my-module-in-release-mode-when-the-app-is-in-debug
     // defaultPublishConfig "debug"
-    compileSdkVersion 22
+    compileSdkVersion 26
     buildToolsVersion '28.0.3'
 
     defaultConfig {
-        compileSdkVersion 22
+        compileSdkVersion 26
         buildToolsVersion "28.0.3"
         minSdkVersion 14
         externalNativeBuild {
@@ -33,7 +33,7 @@ android {
     sourceSets {
         main {
             java {
-                srcDirs('src/main/java', 'src/jni/SDL2-2.0.7/android-project/app/src/main/java')
+                srcDirs('src/main/java', 'src/jni/SDL2-2.0.9/android-project/app/src/main/java')
             }
         }
     }
@@ -49,7 +49,7 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'com.android.support:appcompat-v7:22.2.0'
+    api 'com.android.support:appcompat-v7:26.1.0'
 }
 
 repositories {
diff --git a/love/src/jni/love/Android.mk b/love/src/jni/love/Android.mk
index 47474c28..6338dae8 100644
--- a/love/src/jni/love/Android.mk
+++ b/love/src/jni/love/Android.mk
@@ -18,7 +18,7 @@ LOCAL_C_INCLUDES  :=  \
 	${LOCAL_PATH}/src/libraries/enet/libenet/include \
 	${LOCAL_PATH}/src/libraries/physfs \
 	${LOCAL_PATH}/src/libraries/glslang/glslang/Include \
-	${LOCAL_PATH}/../SDL2-2.0.7/include \
+	${LOCAL_PATH}/../SDL2-2.0.9/include \
 	${LOCAL_PATH}/../jasper-1.900.1/src/libjasper/include \
 	${LOCAL_PATH}/../libmng-1.0.10/ \
 	${LOCAL_PATH}/../lcms2-2.5/include \
@@ -118,7 +118,7 @@ LOCAL_STATIC_LIBRARIES := libvorbis libogg libtheora libmodplug libfreetype libl
 # $(info liblove: include dirs $(LOCAL_C_INCLUDES))
 # $(info liblove: src files $(LOCAL_SRC_FILES))
 
-SDL_PATH := ../SDL2-2.0.7
+SDL_PATH := ../SDL2-2.0.9
 LOCAL_SRC_FILES += $(SDL_PATH)/src/main/android/SDL_android_main.c 
 LOCAL_LDLIBS := -lz -lGLESv1_CM -lGLESv2 -ldl -landroid
 LOCAL_LDFLAGS := -Wl,--allow-multiple-definition
diff --git a/love/src/main/java/org/love2d/android/GameActivity.java b/love/src/main/java/org/love2d/android/GameActivity.java
index 9e75db66..9d534bdb 100644
--- a/love/src/main/java/org/love2d/android/GameActivity.java
+++ b/love/src/main/java/org/love2d/android/GameActivity.java
@@ -52,6 +52,7 @@ public class GameActivity extends SDLActivity {
                 "c++_shared",
                 "mpg123",
                 "openal",
+                "hidapi",
                 "love",
         };
     }