From d39fe0fbf94cad0db0241fba40a9a2f62e26cffc Mon Sep 17 00:00:00 2001 From: David Vacca Date: Sat, 1 Aug 2020 13:26:35 -0700 Subject: [PATCH] Remove fb/xplat_init dependency Summary: This diff removes the fb/xplat_init dependency from fabric onLoad class This is necessary to make RM compile in OSS changelog: [Internal] Internal Reviewed By: RSNara Differential Revision: D22875531 fbshipit-source-id: cc4cd2af875fe7eadfb3a8f4a9f16acf5fa415d8 --- .../facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp index 9cc583c7231..63a0d05445e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp @@ -6,7 +6,6 @@ */ #include -#include #include #include @@ -21,7 +20,7 @@ void jniEnableCppLogging( } JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { - return facebook::xplat::initialize(vm, [] { + return facebook::jni::initialize(vm, [] { // TODO: dvacca ramanpreet unify this with the way // "ComponentDescriptorFactory" is defined in Fabric facebook::react::TurboModuleManager::registerNatives();