Merge pull request #2205 from bugsnag/PLAT-14323/jni-onload

Use JNI_OnLoad to link the NDK plugin

Author: lemnik

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## TBD
 
+### Enhancements
+
+* `bugsnag-plugin-android-ndk` no longer exports the `Java_` JNI functions, and instead uses the JNI `RegisterNatives` API to register the native methods.
+  [#2205](https://github.com/bugsnag/bugsnag-android/pull/2205)
+
 ### Bug fixes
 
 * The `bugsnag-plugin-android-exitinfo` plugin now calls `setProcessState` (if configured) on a background thread and swallows any rate-limiting errors, so that it does not block the main thread during startup

bugsnag-plugin-android-ndk/api/bugsnag-plugin-android-ndk.api

@@ -33,7 +33,6 @@ public final class com/bugsnag/android/ndk/NativeBridge : com/bugsnag/android/in
 	public final fun updateContext (Ljava/lang/String;)V
 	public final fun updateInForeground (ZLjava/lang/String;)V
 	public final fun updateIsLaunching (Z)V
-	public final fun updateLastRunInfo (I)V
 	public final fun updateLowMemory (ZLjava/lang/String;)V
 	public final fun updateOrientation (Ljava/lang/String;)V
 	public final fun updateUserEmail (Ljava/lang/String;)V

bugsnag-plugin-android-ndk/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     loadDefaultPlugins()
+    id("bugsnag-jni-link-table-plugin")
 }
 
 android {

bugsnag-plugin-android-ndk/src/main/CMakeLists.txt

@@ -35,8 +35,6 @@ include_directories(
         jni/external/libunwindstack-ndk/include
 )
 
-target_include_directories(bugsnag-ndk PRIVATE ${BUGSNAG_DIR}/assets/include)
-
 target_link_libraries(
         # Specifies the target library.
         bugsnag-ndk

bugsnag-plugin-android-ndk/src/main/exported_native_symbols-RelWithDebInfo.txt

@@ -6,6 +6,7 @@ global:
     __emutls_get_address;
     __gxx_personality_v0;
     Java_*;
+    JNI_OnLoad;
     extern "C++" {
         "std::get_terminate()";
         "std::set_terminate(void (*)())";

bugsnag-plugin-android-ndk/src/main/java/com/bugsnag/android/ndk/NativeBridge.kt

@@ -84,13 +84,12 @@ class NativeBridge(private val bgTaskService: BackgroundTaskService) : StateObse
     external fun updateContext(context: String)
     external fun updateInForeground(inForeground: Boolean, activityName: String)
     external fun updateIsLaunching(isLaunching: Boolean)
-    external fun updateLastRunInfo(consecutiveLaunchCrashes: Int)
     external fun updateOrientation(orientation: String)
     external fun updateUserId(newValue: String)
     external fun updateUserEmail(newValue: String)
     external fun updateUserName(newValue: String)
-    external fun getSignalUnwindStackFunction(): Long
     external fun updateLowMemory(newValue: Boolean, memoryTrimLevelDescription: String)
+    external fun getSignalUnwindStackFunction(): Long
     external fun addFeatureFlag(name: String, variant: String?)
     external fun clearFeatureFlag(name: String)
     external fun clearFeatureFlags()
@@ -139,7 +138,6 @@ class NativeBridge(private val bgTaskService: BackgroundTaskService) : StateObse
                 event.contextActivity ?: ""
             )
 
-            is StateEvent.UpdateLastRunInfo -> updateLastRunInfo(event.consecutiveLaunchCrashes)
             is StateEvent.UpdateIsLaunching -> {
                 updateIsLaunching(event.isLaunching)