From 3f99d279a748df81002d4cb96e8e41b3b69f212c Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Fri, 24 Dec 2021 10:57:13 +0800
Subject: [PATCH] Update for SDL 2.0.18

---
 android/Android.mk                             | 18 +++---------------
 .../src/main/java/SuperTuxKartActivity.java    |  2 +-
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/android/Android.mk b/android/Android.mk
index a7669ab16..923568c8c 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -240,19 +240,6 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
 
-# hidapi
-LOCAL_MODULE       := libhidapi
-LOCAL_CPPFLAGS     += -std=c++11
-LOCAL_SRC_FILES    := ../lib/sdl2/src/hidapi/android/hid.cpp
-LOCAL_LDLIBS       := -llog
-
-ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
-LOCAL_ARM_NEON     := false
-endif
-include $(BUILD_SHARED_LIBRARY)
-include $(CLEAR_VARS)
-
-
 # SDL2
 LOCAL_MODULE       := SDL2
 LOCAL_PATH         := .
@@ -271,13 +258,15 @@ LOCAL_SRC_FILES    := $(wildcard ../lib/sdl2/src/*.c) \
                       $(wildcard ../lib/sdl2/src/file/*.c) \
                       $(wildcard ../lib/sdl2/src/haptic/*.c) \
                       $(wildcard ../lib/sdl2/src/haptic/android/*.c) \
+                      $(wildcard ../lib/sdl2/src/hidapi/*.c) \
+                      $(wildcard ../lib/sdl2/src/hidapi/android/*.cpp) \
                       $(wildcard ../lib/sdl2/src/joystick/*.c) \
                       $(wildcard ../lib/sdl2/src/joystick/android/*.c) \
                       $(wildcard ../lib/sdl2/src/joystick/hidapi/*.c) \
                       $(wildcard ../lib/sdl2/src/joystick/virtual/*.c) \
+                      $(wildcard ../lib/sdl2/src/loadso/dlopen/*.c) \
                       $(wildcard ../lib/sdl2/src/locale/android/*.c) \
                       $(wildcard ../lib/sdl2/src/locale/*.c) \
-                      $(wildcard ../lib/sdl2/src/loadso/dlopen/*.c) \
                       $(wildcard ../lib/sdl2/src/misc/*.c) \
                       $(wildcard ../lib/sdl2/src/misc/android/*.c) \
                       $(wildcard ../lib/sdl2/src/power/*.c) \
@@ -297,7 +286,6 @@ LOCAL_SRC_FILES    := $(wildcard ../lib/sdl2/src/*.c) \
                       $(wildcard ../lib/sdl2/src/video/yuv2rgb/*.c)
 LOCAL_CFLAGS       := -I../lib/sdl2/include/ -DGL_GLEXT_PROTOTYPES
 LOCAL_LDLIBS       := -ldl -lGLESv1_CM -lGLESv2 -lOpenSLES -llog -landroid
-LOCAL_SHARED_LIBRARIES := hidapi
 LOCAL_STATIC_LIBRARIES := cpufeatures
 
 ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
diff --git a/android/src/main/java/SuperTuxKartActivity.java b/android/src/main/java/SuperTuxKartActivity.java
index cdcd3c6e1..7b2210697 100644
--- a/android/src/main/java/SuperTuxKartActivity.java
+++ b/android/src/main/java/SuperTuxKartActivity.java
@@ -288,7 +288,7 @@ public class SuperTuxKartActivity extends SDLActivity
     /* SDL manually dlopen main to allow unload after main thread exit. */
     protected String[] getLibraries()
     {
-        return new String[]{ "hidapi", "SDL2" };
+        return new String[]{ "SDL2" };
     }
     // ------------------------------------------------------------------------
     protected String getMainSharedObject()