Merge back the 6.33.2-beta.1 hotfix release to main (#3053)

getsentry · Nov 16, 2023 · cb0bf1a · cb0bf1a
1 parent 8c11638
commit cb0bf1a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,28 @@
 
 ### Fixes
 
+-  Fix SIGSEV, SIGABRT and SIGBUS crashes happening after/around the August Google Play System update, see [#2955](https://github.com/getsentry/sentry-java/issues/2955) for more details (fix provided by Native SDK bump)
 - (Internal) Extract Android Profiler and Measurements for Hybrid SDKs ([#3016](https://github.com/getsentry/sentry-java/pull/3016))
 - Ensure DSN uses http/https protocol ([#3044](https://github.com/getsentry/sentry-java/pull/3044))
 
+### Dependencies
+
+- Bump Native SDK from v0.6.6 to v0.6.7 ([#3048](https://github.com/getsentry/sentry-java/pull/3048))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#067)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.6.6...0.6.7)
+
+## 6.33.2-beta.1
+
+### Fixes
+
+-  Fix SIGSEV, SIGABRT and SIGBUS crashes happening after/around the August Google Play System update, see [#2955](https://github.com/getsentry/sentry-java/issues/2955) for more details (fix provided by Native SDK bump)
+
+### Dependencies
+
+- Bump Native SDK from v0.6.6 to v0.6.7 ([#3048](https://github.com/getsentry/sentry-java/pull/3048))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#067)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.6.6...0.6.7)
+
 ### Features
 
 - Add current activity name to app context ([#2999](https://github.com/getsentry/sentry-java/pull/2999))

diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ android.useAndroidX=true
 android.defaults.buildfeatures.buildconfig=true
 
 # Release information
-versionName=6.33.1
+versionName=6.33.2-beta.1
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android

diff --git a/sentry-android-ndk/sentry-native b/sentry-android-ndk/sentry-native
+7 −0		CHANGELOG.md
+1 −1		external/crashpad
+1 −1		include/sentry.h
+1 −1		scripts/start-android.sh
+33 −2		src/backends/sentry_backend_inproc.c
+2 −2		tests/assertions.py
+1 −1		tests/test_integration_http.py