Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for 16KB page sizes (Android 15) #3620

Merged
merged 15 commits into from
Nov 14, 2024
+37 −2
Merged

Add support for 16KB page sizes (Android 15) #3620

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dd2642d
Add support for 16KB page sizes (Android 15)
markushi Aug 6, 2024
7515642
Update Changelog
markushi Aug 6, 2024
aecdf8a
Merge branch 'main' into feat/support_16kb_page_size
markushi Aug 26, 2024
c202950
Merge branch 'main' into feat/support_16kb_page_size
markushi Oct 22, 2024
b15461e
Revert NDK/min API level bump, properly apply link options instead
markushi Oct 22, 2024
5d4703a
Fix Changelog
markushi Oct 22, 2024
ce0aa1f
Exclude sentry-native Java code from being spotless-checked
markushi Oct 22, 2024
c0c5032
Bump sentry-native to 0.7.8
markushi Oct 23, 2024
737176f
Update Changelog
markushi Oct 23, 2024
b0ea8b3
Merge branch 'main' into feat/support_16kb_page_size
markushi Oct 24, 2024
dd10238
Update CHANGELOG.md
markushi Oct 24, 2024
2598f84
release: 7.17.0-alpha.1
getsentry-bot Oct 24, 2024
726c08e
Merge branch 'release/7.17.0-alpha.1' into feat/support_16kb_page_size
Oct 24, 2024
3a7920a
Merge branch 'main' into feat/support_16kb_page_size
markushi Nov 1, 2024
028252d
Merge branch 'main' into feat/support_16kb_page_size
markushi Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,22 @@

## 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))
- 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))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

native 0.7.4+ needed to be in v8
Or did anything change?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed, it's actually fine to bump sentry-native, as the NDK move does still allow us to directly include sentry-native in 7.x

- [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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ spotless {
target("**/*.java")
removeUnusedImports()
googleJavaFormat()
targetExclude("**/generated/**", "**/vendor/**")
targetExclude("**/generated/**", "**/vendor/**", "**/sentry-native/**")
}
kotlin {
target("**/*.kt")
Expand Down
5 changes: 5 additions & 0 deletions sentry-android-ndk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
7 changes: 7 additions & 0 deletions sentry-android-ndk/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@ android {
ignore = true
}
}

@Suppress("UnstableApiUsage")
packagingOptions {
jniLibs {
useLegacyPackaging = true
}
}
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion sentry-android-ndk/sentry-native
Open in desktop
Submodule sentry-native updated 86 files
+12 −0 .craft.yml
+44 −21 .github/workflows/ci.yml
+1 −1 .github/workflows/release.yml
+7 −0 .gitignore
+118 −0 .mvn/wrapper/MavenWrapperDownloader.java
+ − .mvn/wrapper/maven-wrapper.jar
+2 −0 .mvn/wrapper/maven-wrapper.properties
+71 −0 CHANGELOG.md
+14 −8 CMakeLists.txt
+1 −0 CONTRIBUTING.md
+10 −3 README.md
+17 −0 examples/example.c
+1 −1 external/crashpad
+1 −1 include/sentry.h
+75 −0 ndk/README.md
+207 −0 ndk/build.gradle.kts
+ − ndk/debug.keystore
+53 −0 ndk/gradle.properties
+ − ndk/gradle/wrapper/gradle-wrapper.jar
+7 −0 ndk/gradle/wrapper/gradle-wrapper.properties
+249 −0 ndk/gradlew
+92 −0 ndk/gradlew.bat
+18 −0 ndk/lib/CMakeLists.txt
+29 −0 ndk/lib/api/sentry-android-ndk.api
+138 −0 ndk/lib/build.gradle.kts
+22 −0 ndk/lib/proguard-rules.pro
+199 −0 ndk/lib/src/main/java/io/sentry/ndk/DebugImage.java
+18 −0 ndk/lib/src/main/java/io/sentry/ndk/INativeScope.java
+18 −0 ndk/lib/src/main/java/io/sentry/ndk/NativeModuleListLoader.java
+55 −0 ndk/lib/src/main/java/io/sentry/ndk/NativeScope.java
+64 −0 ndk/lib/src/main/java/io/sentry/ndk/NdkOptions.java
+42 −0 ndk/lib/src/main/java/io/sentry/ndk/SentryNdk.java
+489 −0 ndk/lib/src/main/jni/sentry.c
+4 −0 ndk/lib/src/main/res/values/public.xml
+20 −0 ndk/sample/CMakeLists.txt
+76 −0 ndk/sample/build.gradle.kts
+34 −0 ndk/sample/proguard-rules.pro
+18 −0 ndk/sample/src/main/AndroidManifest.xml
+25 −0 ndk/sample/src/main/cpp/ndk-sample.cpp
+54 −0 ndk/sample/src/main/java/io/sentry/ndk/sample/MainActivity.java
+11 −0 ndk/sample/src/main/java/io/sentry/ndk/sample/NdkSample.java
+36 −0 ndk/sample/src/main/res/layout/activity_main.xml
+19 −0 ndk/settings.gradle
+1 −0 scripts/bump-version.sh
+5 −5 scripts/install-llvm-mingw.ps1
+310 −0 scripts/mvnw
+182 −0 scripts/mvnw.cmd
+12 −0 scripts/settings.xml
+15 −2 scripts/start-android.sh
+21 −24 sentry-config.cmake.in
+7 −3 src/backends/sentry_backend_breakpad.cpp
+85 −46 src/backends/sentry_backend_crashpad.cpp
+28 −22 src/backends/sentry_backend_inproc.c
+64 −0 src/path/sentry_path_unix.c
+63 −0 src/path/sentry_path_windows.c
+9 −11 src/sentry_core.c
+5 −5 src/sentry_database.c
+37 −14 src/sentry_envelope.c
+148 −25 src/sentry_json.c
+17 −4 src/sentry_json.h
+3 −1 src/sentry_logger.c
+34 −1 src/sentry_os.c
+3 −0 src/sentry_os.h
+25 −0 src/sentry_path.h
+9 −8 src/sentry_session.c
+2 −2 src/sentry_session.h
+1 −1 src/sentry_slice.c
+9 −0 src/sentry_string.h
+37 −57 src/sentry_tracing.c
+13 −12 src/sentry_utils.c
+10 −10 src/sentry_utils.h
+14 −22 src/sentry_value.c
+40 −16 tests/assertions.py
+14 −0 tests/cmake.py
+7 −0 tests/leaks.txt
+42 −4 tests/test_integration_crashpad.py
+6 −2 tests/test_integration_http.py
+34 −2 tests/test_integration_stdout.py
+2 −2 tests/unit/fuzz.c
+2 −2 tests/unit/test_fuzzfailures.c
+4 −4 tests/unit/test_tracing.c
+11 −11 tests/unit/test_utils.c
+65 −1 tests/unit/test_value.c
+1 −0 tests/unit/tests.inc
+2 −0 vendor/mpack.c
+2 −3 vendor/mpack.h
5 changes: 5 additions & 0 deletions sentry-samples/sentry-samples-android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

7 changes: 7 additions & 0 deletions sentry-samples/sentry-samples-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@ android {
ignore = true
}
}

@Suppress("UnstableApiUsage")
packagingOptions {
jniLibs {
useLegacyPackaging = true
}
}
}

dependencies {
Expand Down
Loading