diff --git a/CHANGELOG.md b/CHANGELOG.md index 98595beaa8..00744b33f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,21 @@ ## 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)) +### 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 diff --git a/build.gradle.kts b/build.gradle.kts index 9d53252562..86cd98d54a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -226,7 +226,7 @@ spotless { target("**/*.java") removeUnusedImports() googleJavaFormat() - targetExclude("**/generated/**", "**/vendor/**") + targetExclude("**/generated/**", "**/vendor/**", "**/sentry-native/**") } kotlin { target("**/*.kt") diff --git a/sentry-android-ndk/CMakeLists.txt b/sentry-android-ndk/CMakeLists.txt index c9a0181935..ff5fc2540b 100644 --- a/sentry-android-ndk/CMakeLists.txt +++ b/sentry-android-ndk/CMakeLists.txt @@ -15,3 +15,8 @@ add_subdirectory(${SENTRY_NATIVE_SRC} sentry_build) target_link_libraries(sentry-android PRIVATE $ ) + +# 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") diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts index f1c4873053..ee0819eb83 100644 --- a/sentry-android-ndk/build.gradle.kts +++ b/sentry-android-ndk/build.gradle.kts @@ -95,6 +95,13 @@ android { ignore = true } } + + @Suppress("UnstableApiUsage") + packagingOptions { + jniLibs { + useLegacyPackaging = true + } + } } dependencies { diff --git a/sentry-android-ndk/sentry-native b/sentry-android-ndk/sentry-native index 0f1d664759..f44ab0be7c 160000 --- a/sentry-android-ndk/sentry-native +++ b/sentry-android-ndk/sentry-native @@ -1 +1 @@ -Subproject commit 0f1d664759cba187a846a562f9d55f3c62dffaa3 +Subproject commit f44ab0be7c9d46bbaf24536fb15e7d55b98d6716 diff --git a/sentry-samples/sentry-samples-android/CMakeLists.txt b/sentry-samples/sentry-samples-android/CMakeLists.txt index ad170fe404..03a2da3f66 100644 --- a/sentry-samples/sentry-samples-android/CMakeLists.txt +++ b/sentry-samples/sentry-samples-android/CMakeLists.txt @@ -15,3 +15,8 @@ target_link_libraries(native-sample PRIVATE ${LOG_LIB} $ ) + +# 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") + diff --git a/sentry-samples/sentry-samples-android/build.gradle.kts b/sentry-samples/sentry-samples-android/build.gradle.kts index 204ef83fc2..90c71b8289 100644 --- a/sentry-samples/sentry-samples-android/build.gradle.kts +++ b/sentry-samples/sentry-samples-android/build.gradle.kts @@ -99,6 +99,13 @@ android { ignore = true } } + + @Suppress("UnstableApiUsage") + packagingOptions { + jniLibs { + useLegacyPackaging = true + } + } } dependencies {