Skip to content

Commit 091f84e

Browse files
markushigetsentry-botgetsentry-bot
authored
Add support for 16KB page sizes (Android 15) (getsentry#3620)
* Add support for 16KB page sizes (Android 15) * Update Changelog * Revert NDK/min API level bump, properly apply link options instead * Fix Changelog * Exclude sentry-native Java code from being spotless-checked * Bump sentry-native to 0.7.8 * Update Changelog * Update CHANGELOG.md * release: 7.17.0-alpha.1 --------- Co-authored-by: getsentry-bot <[email protected]> Co-authored-by: getsentry-bot <[email protected]>
1 parent 17a41c1 commit 091f84e

File tree

7 files changed

+37
-2
lines changed

7 files changed

+37
-2
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,21 @@
22

33
## Unreleased
44

5+
### Features
6+
7+
- Android 15: Add support for 16KB page sizes ([#3620](https://github.com/getsentry/sentry-java/pull/3620))
8+
- See https://developer.android.com/guide/practices/page-sizes for more details
9+
510
### Fixes
611

712
- Ensure android initialization process continues even if options configuration block throws an exception ([#3887](https://github.com/getsentry/sentry-java/pull/3887))
813

14+
### Dependencies
15+
16+
- Bump Native SDK from v0.7.2 to v0.7.8 ([#3620](https://github.com/getsentry/sentry-java/pull/3620))
17+
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#078)
18+
- [diff](https://github.com/getsentry/sentry-native/compare/0.7.2...0.7.8)
19+
920
## 7.17.0
1021

1122
### Features

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ spotless {
226226
target("**/*.java")
227227
removeUnusedImports()
228228
googleJavaFormat()
229-
targetExclude("**/generated/**", "**/vendor/**")
229+
targetExclude("**/generated/**", "**/vendor/**", "**/sentry-native/**")
230230
}
231231
kotlin {
232232
target("**/*.kt")

sentry-android-ndk/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,8 @@ add_subdirectory(${SENTRY_NATIVE_SRC} sentry_build)
1515
target_link_libraries(sentry-android PRIVATE
1616
$<BUILD_INTERFACE:sentry::sentry>
1717
)
18+
19+
# Android 15: Support 16KB page sizes
20+
# see https://developer.android.com/guide/practices/page-sizes
21+
target_link_options(sentry PRIVATE "-Wl,-z,max-page-size=16384")
22+
target_link_options(sentry-android PRIVATE "-Wl,-z,max-page-size=16384")

sentry-android-ndk/build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@ android {
9595
ignore = true
9696
}
9797
}
98+
99+
@Suppress("UnstableApiUsage")
100+
packagingOptions {
101+
jniLibs {
102+
useLegacyPackaging = true
103+
}
104+
}
98105
}
99106

100107
dependencies {

sentry-android-ndk/sentry-native

Submodule sentry-native updated 86 files

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,8 @@ target_link_libraries(native-sample PRIVATE
1515
${LOG_LIB}
1616
$<BUILD_INTERFACE:sentry::sentry>
1717
)
18+
19+
# Android 15: Support 16KB page sizes
20+
# see https://developer.android.com/guide/practices/page-sizes
21+
target_link_options(native-sample PRIVATE "-Wl,-z,max-page-size=16384")
22+

sentry-samples/sentry-samples-android/build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,13 @@ android {
9999
ignore = true
100100
}
101101
}
102+
103+
@Suppress("UnstableApiUsage")
104+
packagingOptions {
105+
jniLibs {
106+
useLegacyPackaging = true
107+
}
108+
}
102109
}
103110

104111
dependencies {

0 commit comments

Comments
 (0)