diff --git a/CHANGELOG.md b/CHANGELOG.md index d8437c16a..179de9117 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ - Change the timestamp resolution to microseconds. ([#995](https://github.com/getsentry/sentry-native/pull/995)) +**Internal**: + +- (Android) Switch ndk back to `libc++_static`, and hide it from prefab ([#996](https://github.com/getsentry/sentry-native/pull/996)) + ## 0.7.4 **Fixes**: diff --git a/ndk/lib/build.gradle.kts b/ndk/lib/build.gradle.kts index f14ce9a72..8e3600a59 100644 --- a/ndk/lib/build.gradle.kts +++ b/ndk/lib/build.gradle.kts @@ -15,7 +15,7 @@ android { externalNativeBuild { cmake { - arguments.add(0, "-DANDROID_STL=c++_shared") + arguments.add(0, "-DANDROID_STL=c++_static") arguments.add(0, "-DSENTRY_NATIVE_SRC=$sentryNativeSrc") } } @@ -91,3 +91,42 @@ android { dependencies { compileOnly("org.jetbrains:annotations:23.0.0") } + +/* + * Prefab doesn't support c++_static, so we need to change it to none. + * This should be fine, as we don't expose any conflicting symbols. + * Based on: https://github.com/bugsnag/bugsnag-android/blob/59460018551750dfcce4fd4e9f612eae7826559e/bugsnag-plugin-android-ndk/build.gradle.kts + * + * Copyright (c) 2012 Bugsnag + + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ +afterEvaluate { + tasks.getByName("prefabReleasePackage") { + doLast { + project.fileTree("build/intermediates/prefab_package/") { + include("**/abi.json") + }.forEach { file -> + file.writeText(file.readText().replace("c++_static", "none")) + } + } + } +}