Merge pull request #145 from OpenBrickProtocolFoundation/update-sdl

Update sdl to 2.30.3

Author: Totto16

.github/workflows/android.yml

@@ -46,9 +46,10 @@ jobs:
 
       - name: Setup NDK
         run: | 
-          sdkmanager --install "ndk;26.3.11579264"
+          sdkmanager --install "ndk;27.0.11718014"
 
-      - name: Build natibe libraries
+
+      - name: Build native libraries
         run: |
           bash ./platforms/build-android.sh ${{ matrix.config.arch }} complete_rebuild release
           cp -r ./assets/ platforms/android/app/src/main

meson.build

@@ -11,7 +11,7 @@ project(
         'b_ndebug': 'if-release',
 
     },
-    version: '0.5.4',
+    version: '0.5.5',
 )
 
 subdir('tools/options')

platforms/android/app/build.gradle

@@ -212,14 +212,14 @@ android {
     }
 
     compileSdkVersion 34
-    ndkVersion "26.3.11579264"
+    ndkVersion "27.0.11718014-rc1"
     defaultConfig {
         if (buildAsApplication) {
             applicationId "com.github.oopetris"
         }
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 5
+        versionCode 6
         versionName(versionString)
     }
     buildTypes {

platforms/android/app/jni/Android.mk

@@ -6,7 +6,7 @@ SUBPROJECTS_PATH :=$(BUILD_PATH)/subprojects
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := SDL2
-LIB_PATH := $(SUBPROJECTS_PATH)/SDL2-2.28.5
+LIB_PATH := $(SUBPROJECTS_PATH)/SDL2-2.30.3
 LOCAL_C_INCLUDES := $(LIB_PATH)/include
 LOCAL_SRC_FILES := $(LIB_PATH)/libsdl2.so
 include $(PREBUILT_SHARED_LIBRARY)

platforms/android/app/src/main/AndroidManifest.xml

@@ -38,7 +38,7 @@
         android:required="false" /> -->
 
     <!-- Allow downloading to the external storage on Android 5.1 and older -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="22" />
+    <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="22" /> -->
 
     <!-- Allow access to Bluetooth devices -->
     <!-- Currently this is just for Steam Controller support and requires setting SDL_HINT_JOYSTICK_HIDAPI_STEAM -->
@@ -51,6 +51,14 @@
     <!-- if you want to capture audio, uncomment this. -->
     <!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->
 
+    <!-- Create a Java class extending SDLActivity and place it in a
+         directory under app/src/main/java matching the package, e.g. app/src/main/java/com/gamemaker/game/MyGame.java
+ 
+         then replace "SDLActivity" with the name of your class (e.g. "MyGame")
+         in the XML below.
+
+         An example Java class can be found in README-android.md
+    -->
     <application android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="true"
@@ -68,7 +76,6 @@
             android:configChanges="layoutDirection|locale|orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
             android:preferMinimalPostProcessing="true"
             android:exported="true"
-            android:screenOrientation="portrait"
             >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

platforms/android/app/src/main/java/org/libsdl/app/HIDDevice.java

@@ -0,0 +1,22 @@
+package org.libsdl.app;
+
+import android.hardware.usb.UsbDevice;
+
+interface HIDDevice
+{
+    public int getId();
+    public int getVendorId();
+    public int getProductId();
+    public String getSerialNumber();
+    public int getVersion();
+    public String getManufacturerName();
+    public String getProductName();
+    public UsbDevice getDevice();
+    public boolean open();
+    public int sendFeatureReport(byte[] report);
+    public int sendOutputReport(byte[] report);
+    public boolean getFeatureReport(byte[] report);
+    public void setFrozen(boolean frozen);
+    public void close();
+    public void shutdown();
+}