diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt index cf8ffe295e4119..0e49300c78e8a4 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt @@ -10,7 +10,6 @@ file(GLOB reactnativejni_SRC CONFIGURE_DEPENDS *.cpp) add_compile_options( -fexceptions - -frtti -Wno-unused-lambda-capture -std=c++17 -DWITH_INSPECTOR=1) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp index 833db513e2f849..f99e2dbd262ee0 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp @@ -13,14 +13,6 @@ using namespace facebook::jni; namespace facebook::react { -// TODO T112842309: Remove after fbjni upgraded in OSS -void ReadableNativeArray::mapException(const std::exception &ex) { - if (dynamic_cast(&ex) != nullptr) { - throwNewJavaException( - exceptions::gUnexpectedNativeTypeExceptionClass, ex.what()); - } -} - void ReadableNativeArray::mapException(std::exception_ptr ex) { try { std::rethrow_exception(ex); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h index 52ab38f0bafa9d..b9c0d780faee1c 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h @@ -32,7 +32,6 @@ class ReadableNativeArray static constexpr const char *kJavaDescriptor = "Lcom/facebook/react/bridge/ReadableNativeArray;"; - static void mapException(const std::exception &ex); static void mapException(std::exception_ptr ex); static void registerNatives(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp index 6a9d554b9ac4a7..75b0d16ebf1dc5 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp @@ -11,14 +11,6 @@ using namespace facebook::jni; namespace facebook::react { -// TODO T112842309: Remove after fbjni upgraded in OSS -void ReadableNativeMap::mapException(const std::exception &ex) { - if (dynamic_cast(&ex) != nullptr) { - throwNewJavaException( - exceptions::gUnexpectedNativeTypeExceptionClass, ex.what()); - } -} - void ReadableNativeMap::mapException(std::exception_ptr ex) { try { std::rethrow_exception(ex); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h index 2513a8a6028c27..4fa3c481e9eea8 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h @@ -40,7 +40,6 @@ struct ReadableNativeMap : jni::HybridClass { std::optional keys_; static jni::local_ref createWithContents(folly::dynamic &&map); - static void mapException(const std::exception &ex); static void mapException(std::exception_ptr ex); static void registerNatives();