Merge branch 'main' into rz/fix/do-not-report-bad-data-anrs

Author: romtsn

CHANGELOG.md

@@ -2,12 +2,23 @@
 
 ## Unreleased
 
+### Features
+
+- Android 15: Add support for 16KB page sizes ([#3620](https://github.com/getsentry/sentry-java/pull/3620))
+  - See https://developer.android.com/guide/practices/page-sizes for more details
+
 ### Fixes
 
 - Ensure android initialization process continues even if options configuration block throws an exception ([#3887](https://github.com/getsentry/sentry-java/pull/3887))
 - Do not report parsing ANR error when there are no threads ([#3888](https://github.com/getsentry/sentry-java/pull/3888))
   - This should significantly reduce the number of events with message "Sentry Android SDK failed to parse system thread dump..." reported
 
+### Dependencies
+
+- Bump Native SDK from v0.7.2 to v0.7.8 ([#3620](https://github.com/getsentry/sentry-java/pull/3620))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#078)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.7.2...0.7.8)
+
 ## 7.17.0
 
 ### Features

build.gradle.kts

@@ -226,7 +226,7 @@ spotless {
         target("**/*.java")
         removeUnusedImports()
         googleJavaFormat()
-        targetExclude("**/generated/**", "**/vendor/**")
+        targetExclude("**/generated/**", "**/vendor/**", "**/sentry-native/**")
     }
     kotlin {
         target("**/*.kt")

sentry-android-ndk/CMakeLists.txt

@@ -15,3 +15,8 @@ add_subdirectory(${SENTRY_NATIVE_SRC} sentry_build)
 target_link_libraries(sentry-android PRIVATE
     $<BUILD_INTERFACE:sentry::sentry>
 )
+
+# Android 15: Support 16KB page sizes
+# see https://developer.android.com/guide/practices/page-sizes
+target_link_options(sentry PRIVATE "-Wl,-z,max-page-size=16384")
+target_link_options(sentry-android PRIVATE "-Wl,-z,max-page-size=16384")

sentry-android-ndk/build.gradle.kts

@@ -95,6 +95,13 @@ android {
             ignore = true
         }
     }
+
+    @Suppress("UnstableApiUsage")
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
 }
 
 dependencies {

sentry-android-ndk/sentry-native

@@ -15,3 +15,8 @@ target_link_libraries(native-sample PRIVATE
     ${LOG_LIB}
     $<BUILD_INTERFACE:sentry::sentry>
 )
+
+# Android 15: Support 16KB page sizes
+# see https://developer.android.com/guide/practices/page-sizes
+target_link_options(native-sample PRIVATE "-Wl,-z,max-page-size=16384")
+

sentry-samples/sentry-samples-android/CMakeLists.txt

@@ -99,6 +99,13 @@ android {
             ignore = true
         }
     }
+
+    @Suppress("UnstableApiUsage")
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
 }
 
 dependencies {