From dd2642d811dbfa74ef0924616aaa265c72abbc7c Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Tue, 6 Aug 2024 07:41:21 +0200 Subject: [PATCH 1/9] Add support for 16KB page sizes (Android 15) --- sentry-android-ndk/CMakeLists.txt | 4 ++++ sentry-android-ndk/build.gradle.kts | 7 +++++++ sentry-android-ndk/sentry-native | 2 +- sentry-samples/sentry-samples-android/CMakeLists.txt | 5 +++++ sentry-samples/sentry-samples-android/build.gradle.kts | 7 +++++++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/sentry-android-ndk/CMakeLists.txt b/sentry-android-ndk/CMakeLists.txt index c9a0181935..10f6ee0cac 100644 --- a/sentry-android-ndk/CMakeLists.txt +++ b/sentry-android-ndk/CMakeLists.txt @@ -15,3 +15,7 @@ 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-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 f6564cd97f..9caafeb6de 100644 --- a/sentry-android-ndk/build.gradle.kts +++ b/sentry-android-ndk/build.gradle.kts @@ -95,6 +95,13 @@ android { ignore = true } } + + packagingOptions { + jniLibs { + useLegacyPackaging = true + } + } + ndkVersion = "27.0.12077973" } dependencies { diff --git a/sentry-android-ndk/sentry-native b/sentry-android-ndk/sentry-native index 0f1d664759..17bcd67163 160000 --- a/sentry-android-ndk/sentry-native +++ b/sentry-android-ndk/sentry-native @@ -1 +1 @@ -Subproject commit 0f1d664759cba187a846a562f9d55f3c62dffaa3 +Subproject commit 17bcd67163aea3e65b08184a02f96f64c56dcc38 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 a8d8897519..8181f9df9e 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 } } + + packagingOptions { + jniLibs { + useLegacyPackaging = true + } + } + ndkVersion = "27.0.12077973" } dependencies { From 7515642a5b711e48c26451d7234d49b3a3f8876a Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Tue, 6 Aug 2024 09:10:39 +0200 Subject: [PATCH 2/9] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25cbbdffba..08df30b81a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ - Avoid ArrayIndexOutOfBoundsException on Android cpu data collection ([#3598](https://github.com/getsentry/sentry-java/pull/3598)) - Fix lazy select queries instrumentation ([#3604](https://github.com/getsentry/sentry-java/pull/3604)) +### Features + +- Add support for 16KB page sizes (Android 15) ([#3620](https://github.com/getsentry/sentry-java/pull/3620)) + ### Chores - Introduce `ReplayShadowMediaCodec` and refactor tests using custom encoder ([#3612](https://github.com/getsentry/sentry-java/pull/3612)) From b15461e4d31f7425d610507d3617bdcbad452cfa Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Tue, 22 Oct 2024 12:44:29 +0200 Subject: [PATCH 3/9] Revert NDK/min API level bump, properly apply link options instead --- sentry-android-ndk/CMakeLists.txt | 1 + sentry-android-ndk/build.gradle.kts | 2 +- sentry-samples/sentry-samples-android/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sentry-android-ndk/CMakeLists.txt b/sentry-android-ndk/CMakeLists.txt index 10f6ee0cac..ff5fc2540b 100644 --- a/sentry-android-ndk/CMakeLists.txt +++ b/sentry-android-ndk/CMakeLists.txt @@ -18,4 +18,5 @@ 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 8746f58ed2..ee0819eb83 100644 --- a/sentry-android-ndk/build.gradle.kts +++ b/sentry-android-ndk/build.gradle.kts @@ -96,12 +96,12 @@ android { } } + @Suppress("UnstableApiUsage") packagingOptions { jniLibs { useLegacyPackaging = true } } - ndkVersion = "27.0.12077973" } dependencies { diff --git a/sentry-samples/sentry-samples-android/build.gradle.kts b/sentry-samples/sentry-samples-android/build.gradle.kts index 8a9f354bc0..90c71b8289 100644 --- a/sentry-samples/sentry-samples-android/build.gradle.kts +++ b/sentry-samples/sentry-samples-android/build.gradle.kts @@ -100,12 +100,12 @@ android { } } + @Suppress("UnstableApiUsage") packagingOptions { jniLibs { useLegacyPackaging = true } } - ndkVersion = "27.0.12077973" } dependencies { From 5d4703a3d2281214e62a1e98bc764fc2a5d69383 Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Tue, 22 Oct 2024 13:00:35 +0200 Subject: [PATCH 4/9] Fix Changelog --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66777f18c3..eb429bb95f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Features + +- Add support for 16KB page sizes (Android 15) ([#3620](https://github.com/getsentry/sentry-java/pull/3620)) + ### Fixes - Load lazy fields on init in the background ([#3803](https://github.com/getsentry/sentry-java/pull/3803)) @@ -78,10 +82,6 @@ - Fix `RejectedExecutionException` when redacting a screenshot - Fix `FileNotFoundException` when persisting segment values -### Features - -- Add support for 16KB page sizes (Android 15) ([#3620](https://github.com/getsentry/sentry-java/pull/3620)) - ### Chores - Introduce `ReplayShadowMediaCodec` and refactor tests using custom encoder ([#3612](https://github.com/getsentry/sentry-java/pull/3612)) From ce0aa1fe2c4eb3c06fcd4a3a1549a5946916a93c Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Tue, 22 Oct 2024 13:24:39 +0200 Subject: [PATCH 5/9] Exclude sentry-native Java code from being spotless-checked --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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") From c0c5032cf417317e24e198c4ea5a9443a04ab222 Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Wed, 23 Oct 2024 11:15:30 +0200 Subject: [PATCH 6/9] Bump sentry-native to 0.7.8 --- sentry-android-ndk/sentry-native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry-android-ndk/sentry-native b/sentry-android-ndk/sentry-native index 17bcd67163..f44ab0be7c 160000 --- a/sentry-android-ndk/sentry-native +++ b/sentry-android-ndk/sentry-native @@ -1 +1 @@ -Subproject commit 17bcd67163aea3e65b08184a02f96f64c56dcc38 +Subproject commit f44ab0be7c9d46bbaf24536fb15e7d55b98d6716 From 737176f7e0dbe385cfd99375e29ca3ab003cc314 Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Wed, 23 Oct 2024 11:15:53 +0200 Subject: [PATCH 7/9] Update Changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb429bb95f..1304c1dc0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,13 @@ - Load lazy fields on init in the background ([#3803](https://github.com/getsentry/sentry-java/pull/3803)) - Replace setOf with HashSet.add ([#3801](https://github.com/getsentry/sentry-java/pull/3801)) +### 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.16.0-alpha.1 ### Features From dd10238d1e73ebc02993a67ed6c5beae5f233ea9 Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Thu, 24 Oct 2024 15:21:33 +0200 Subject: [PATCH 8/9] Update CHANGELOG.md --- CHANGELOG.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1eb58cac2..bee8b4bc7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,17 @@ # Changelog -## 7.16.0 +## Unreleased ### Features -- Add meta option to attach ANR thread dumps ([#3791](https://github.com/getsentry/sentry-java/pull/3791)) +- 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 + +## 7.16.0 ### Features -- Add support for 16KB page sizes (Android 15) ([#3620](https://github.com/getsentry/sentry-java/pull/3620)) +- Add meta option to attach ANR thread dumps ([#3791](https://github.com/getsentry/sentry-java/pull/3791)) ### Fixes From 2598f84f1de3653dcf630a07c85e4d4f10108924 Mon Sep 17 00:00:00 2001 From: getsentry-bot Date: Thu, 24 Oct 2024 14:00:39 +0000 Subject: [PATCH 9/9] release: 7.17.0-alpha.1 --- CHANGELOG.md | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bee8b4bc7d..7fde5cf909 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased +## 7.17.0-alpha.1 ### Features diff --git a/gradle.properties b/gradle.properties index 4268e10785..2a3cb3f816 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ android.useAndroidX=true android.defaults.buildfeatures.buildconfig=true # Release information -versionName=7.16.0 +versionName=7.17.0-alpha.1 # Override the SDK name on native crashes on Android sentryAndroidSdkName=sentry.native.android