Merge 5d4703a into 4988d5b

markushi · web-flow · commit f453acaf7e6a · 2024-10-22T13:00:46.000+02:00
diff --git 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))
diff --git 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
     $<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")
diff --git 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
@@ -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
@@ -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")
+
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -15,3 +15,8 @@ add_subdirectory(${SENTRY_NATIVE_SRC} sentry_build)`
`15`	`15`	`target_link_libraries(sentry-android PRIVATE`
`16`	`16`	`$<BUILD_INTERFACE:sentry::sentry>`
`17`	`17`	`)`
	`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")`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,13 @@ android {`
`95`	`95`	`ignore = true`
`96`	`96`	`}`
`97`	`97`	`}`
	`98`	`+`
	`99`	`+ @Suppress("UnstableApiUsage")`
	`100`	`+ packagingOptions {`
	`101`	`+ jniLibs {`
	`102`	`+ useLegacyPackaging = true`
	`103`	`+ }`
	`104`	`+ }`
`98`	`105`	`}`
`99`	`106`
`100`	`107`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -15,3 +15,8 @@ target_link_libraries(native-sample PRIVATE`
`15`	`15`	`${LOG_LIB}`
`16`	`16`	`$<BUILD_INTERFACE:sentry::sentry>`
`17`	`17`	`)`
	`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`	`+`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,13 @@ android {`
`99`	`99`	`ignore = true`
`100`	`100`	`}`
`101`	`101`	`}`
	`102`	`+`
	`103`	`+ @Suppress("UnstableApiUsage")`
	`104`	`+ packagingOptions {`
	`105`	`+ jniLibs {`
	`106`	`+ useLegacyPackaging = true`
	`107`	`+ }`
	`108`	`+ }`
`102`	`109`	`}`
`103`	`110`
`104`	`111`	`dependencies {`