Android: Support API Level 34 with GStreamer-1.24

This patch mainly revises the gradle and ndk-build build scripts to support Android API Level 34 with GStreamer v1.24 (the latest GST release as of 2024.03). Signed-off-by: Wook Song <[email protected]>
nnstreamer · Apr 4, 2024 · d8e002e · d8e002e
1 parent 5062d48
commit d8e002e
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 37 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.bat text eol=crlf
diff --git a/java/android/build.gradle b/java/android/build.gradle
diff --git a/java/android/nnstreamer/build.gradle b/java/android/nnstreamer/build.gradle
@@ -1,16 +1,17 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    namespace "org.nnsuite.nnstreamer"
+    compileSdk 34
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 28
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             ndkBuild {
+                ndkVersion "25.2.9519653"
                 def gstRoot
 
                 if (project.hasProperty('gstAndroidRoot'))
@@ -65,6 +66,13 @@ android {
             }
         }
     }
+    compileOptions {
+        // Flag to enable support for the new language APIs
+        coreLibraryDesugaringEnabled true
+        // Sets Java compatibility to Java 8
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
     buildTypes {
         debug {
             testCoverageEnabled true
@@ -92,6 +100,7 @@ android {
                 jniLibs.srcDirs += project.properties['NNFW_EXT_LIBRARY_PATH']
                 println 'Set jniLibs.srcDirs includes libraries for NNFW'
             }
+
         }
     }
     packagingOptions {
@@ -103,6 +112,7 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:28.0.0'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
     testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'

diff --git a/java/android/nnstreamer/src/main/AndroidManifest.xml b/java/android/nnstreamer/src/main/AndroidManifest.xml
@@ -1,9 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.nnsuite.nnstreamer" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:glEsVersion="0x00020000"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:extractNativeLibs="true"

diff --git a/java/android/nnstreamer/src/main/jni/Android-nnstreamer.mk b/java/android/nnstreamer/src/main/jni/Android-nnstreamer.mk
@@ -97,8 +97,8 @@ LOCAL_C_INCLUDES += $(PAHO_MQTT_C_INCLUDES)
 endif
 
 LOCAL_EXPORT_C_INCLUDES := $(NNSTREAMER_CAPI_INCLUDES)
-LOCAL_CFLAGS := -O3 -fPIC $(NNS_API_FLAGS)
-LOCAL_CXXFLAGS := -O3 -fPIC -frtti -fexceptions $(NNS_API_FLAGS)
+LOCAL_CFLAGS := -O3 -fPIC $(NNS_API_FLAGS) -Wno-deprecated-declarations
+LOCAL_CXXFLAGS := -O3 -fPIC -frtti -fexceptions $(NNS_API_FLAGS) -Wno-c99-designator
 
 ifeq ($(ENABLE_MQTT), true)
 LOCAL_STATIC_LIBRARIES := paho-mqtt3a paho-mqtt3c

diff --git a/java/android/nnstreamer/src/main/jni/Android.mk b/java/android/nnstreamer/src/main/jni/Android.mk
@@ -171,10 +171,17 @@ include $(BUILD_SHARED_LIBRARY)
 #------------------------------------------------------
 # gstreamer for android
 #------------------------------------------------------
-GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/
+GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build
 include $(LOCAL_PATH)/Android-gst-plugins.mk
 
-GSTREAMER_PLUGINS        := $(GST_REQUIRED_PLUGINS)
+GST_BLOCKED_PLUGINS      := \
+        fallbackswitch livesync rsinter rstracers \
+        threadshare togglerecord cdg claxon dav1d rsclosedcaption \
+        ffv1 fmp4 mp4 gif hsv lewton rav1e json rspng regex textwrap textahead \
+        aws hlssink3 ndi rsonvif raptorq reqwest rsrtp rsrtsp webrtchttp rswebrtc uriplaylistbin \
+        rsaudiofx rsvideofx
+
+GSTREAMER_PLUGINS        := $(filter-out $(GST_BLOCKED_PLUGINS), $(GST_REQUIRED_PLUGINS))
 GSTREAMER_EXTRA_DEPS     := $(GST_REQUIRED_DEPS) glib-2.0 gio-2.0 gmodule-2.0
 GSTREAMER_EXTRA_LIBS     := $(GST_REQUIRED_LIBS) -liconv
 

diff --git a/java/android/nnstreamer/src/main/jni/nnstreamer-native-api.c b/java/android/nnstreamer/src/main/jni/nnstreamer-native-api.c
@@ -57,10 +57,22 @@ extern void init_filter_torch (void);
 extern void init_filter_mxnet (void);
 #endif
 
+
+#if defined GST_VERSION_MINOR && GST_VERSION_MINOR >= 24
+/**
+ * @brief External function from GStreamer Android. (Dummy function)
+ */
+static void gst_android_init (JNIEnv * env, jobject context) {
+    do {
+
+    } while(0);
+}
+#else
 /**
  * @brief External function from GStreamer Android.
  */
 extern void gst_android_init (JNIEnv * env, jobject context);
+#endif /* GST_VERSION_MINOR >= 24 */
 #endif /* __ANDROID__ */
 
 /**

diff --git a/java/android/settings.gradle b/java/android/settings.gradle
diff --git a/java/build-nnstreamer-android.sh b/java/build-nnstreamer-android.sh
@@ -499,7 +499,6 @@ sed -i "s|mlApiRoot=ml-api-path|mlApiRoot=$ml_api_dir|" gradle.properties
 sed -i "s|nnstreamerEdgeRoot=nnstreamer-edge-path|nnstreamerEdgeRoot=$nnstreamer_edge_dir|" gradle.properties
 sed -i "s|nnstreamerRoot=nnstreamer-path|nnstreamerRoot=$nnstreamer_dir|" gradle.properties
 sed -i "s|gstAndroidRoot=gstreamer-path|gstAndroidRoot=$gstreamer_dir|" gradle.properties
-sed -i "s|ndk.dir=ndk-path|ndk.dir=$android_ndk_dir|" local.properties
 sed -i "s|sdk.dir=sdk-path|sdk.dir=$android_sdk_dir|" local.properties
 
 # Update SNAP option

diff --git a/java/build-nnstreamer-ubuntu.sh b/java/build-nnstreamer-ubuntu.sh