diff --git a/android/build.gradle b/android/build.gradle index 9e2d5d08..748b7995 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -142,6 +142,11 @@ android { buildConfigField "boolean", "USE_EXOPLAYER_DASH", ExoplayerDependencies["useExoplayerDash"].toString() buildConfigField "boolean", "USE_EXOPLAYER_HLS", ExoplayerDependencies["useExoplayerHls"].toString() buildConfigField "boolean", "USE_EXOPLAYER_RTSP", ExoplayerDependencies["useExoplayerRtsp"].toString() + externalNativeBuild { + cmake { + arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON" + } + } ndk { abiFilters(*reactNativeArchitectures()) diff --git a/android/gradle.properties b/android/gradle.properties index 165f07f5..acec563d 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,9 +1,9 @@ RNVideo_kotlinVersion=1.8.0 -RNVideo_minSdkVersion=23 -RNVideo_targetSdkVersion=34 -RNVideo_compileSdkVersion=34 -RNVideo_ndkversion=26.1.10909125 -RNVideo_buildToolsVersion=34.0.0 +RNVideo_minSdkVersion=24 +RNVideo_targetSdkVersion=35 +RNVideo_compileSdkVersion=35 +RNVideo_ndkversion=27.1.12297006 +RNVideo_buildToolsVersion=35.0.0 RNVideo_media3Version=1.4.1 RNVideo_useExoplayerIMA=false RNVideo_useExoplayerRtsp=false diff --git a/android/src/main/java/com/brentvatne/common/react/VideoEventEmitter.kt b/android/src/main/java/com/brentvatne/common/react/VideoEventEmitter.kt index 628ff8e1..60129329 100644 --- a/android/src/main/java/com/brentvatne/common/react/VideoEventEmitter.kt +++ b/android/src/main/java/com/brentvatne/common/react/VideoEventEmitter.kt @@ -142,20 +142,28 @@ class VideoEventEmitter { putString("errorStackTrace", stackTrace) // https://github.com/facebook/react-native/blob/v0.80.2/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp#L465 - putMap("cause", Arguments.createMap().apply { - putString("name", exception.javaClass.simpleName) - exception.message?.let { putString("message", it) } - putArray("stackElements", Arguments.createArray().apply { - exception.stackTrace.forEach { element -> - pushMap(Arguments.createMap().apply { - putString("className", element.className) - putString("fileName", element.fileName) - putInt("lineNumber", element.lineNumber) - putString("methodName", element.methodName) - }) - } - }) - }) + putMap( + "cause", + Arguments.createMap().apply { + putString("name", exception.javaClass.simpleName) + exception.message?.let { putString("message", it) } + putArray( + "stackElements", + Arguments.createArray().apply { + exception.stackTrace.forEach { element -> + pushMap( + Arguments.createMap().apply { + putString("className", element.className) + putString("fileName", element.fileName) + putInt("lineNumber", element.lineNumber) + putString("methodName", element.methodName) + } + ) + } + } + ) + } + ) } ) }