android: Update catch2 to v2.7.0
Local change aosp/729005 is not necessary any more. Upstream has similar
change:
https://github.com/catchorg/Catch2/commit/8b0188385498d6ac101854dc3983c6ebd220adc3
Test: run both libcatch2-test and libcatch2-test-upstream on both host and target
Test: run librxcpp-tests --nothrow and librxcpp-tests-upstream
Change-Id: If321d27164aa70a88b7c1aec11cfa71d3b8e574d
diff --git a/Android.bp b/Android.bp
index 42df9d6..4852cf0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,6 +18,7 @@
local_include_dirs: ["include"], // cc_test ignores export_include_dirs
export_include_dirs: ["include"],
srcs: ["include/**/*.cpp"],
+ exclude_srcs: ["include/catch_with_main.cpp"],
}
// !!! IMPORTANT: Use 'whole_static_libs' or the linker will dead-code-eliminate
@@ -33,9 +34,7 @@
"libcatch2-defaults",
],
srcs: [
- // cannot use catch_with_main.hpp as main, soong errors with "has unknown extension"
- // "include/catch_with_main.hpp",
- "examples/000-CatchMain.cpp",
+ "include/catch_with_main.cpp",
],
}
@@ -46,6 +45,7 @@
defaults: [
"libcatch2-defaults",
],
+ cflags: ["-DCATCH_CONFIG_DISABLE_EXCEPTIONS"],
}
// This rule can be used by other external/ projects that depend on catch2
@@ -55,7 +55,6 @@
defaults: [
"libcatch2-defaults",
],
- rtti: true,
cflags: ["-fexceptions"],
}
@@ -74,7 +73,7 @@
],
}
-// Upstream config: RTTI and exceptions are enabled.
+// Upstream config: Exceptions are enabled.
// This should be validated first after an upstream merge.
cc_test {
name: "libcatch2-tests-upstream",
@@ -83,7 +82,6 @@
],
gtest: false,
- rtti: true,
cflags: ["-fexceptions"],
whole_static_libs: [
@@ -91,13 +89,17 @@
],
}
-// Android config: RTTI and exceptions are disabled.
+// Android config: Exceptions are disabled.
// This should be validated second after an upstream merge.
cc_test {
name: "libcatch2-tests",
defaults: [
"libcatch2-defaults-tests",
],
+ cflags: [
+ "-DCATCH_CONFIG_DISABLE_EXCEPTIONS",
+ "-Wno-unused-function",
+ ],
gtest: false,
whole_static_libs: [
"libcatch2",