From 18eb7aea97a4cdc76354745f4caa675429e15db0 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Wed, 1 Mar 2017 13:35:32 -0800
Subject: [PATCH] Fix the RN OSS gradle build

Reviewed By: ericvicenti

Differential Revision: D4636504

fbshipit-source-id: 89a776902d893c19dff81afcf1cba631c220c9c2
---
 ReactAndroid/src/main/jni/xreact/jni/BUCK       | 1 +
 ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/jni/xreact/jni/BUCK b/ReactAndroid/src/main/jni/xreact/jni/BUCK
index dab0e2a64..6c2be6899 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/BUCK
+++ b/ReactAndroid/src/main/jni/xreact/jni/BUCK
@@ -47,6 +47,7 @@ cxx_library(
         "//native/fb:fb",
         "//native/third-party/android-ndk:android",
         "//xplat/folly:molly",
+        "//xplat/fbgloginit:fbgloginit",
         "//xplat/fbsystrace:fbsystrace",
         react_native_xplat_target("cxxreact:bridge"),
         react_native_xplat_target("cxxreact:module"),
diff --git a/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp
index 8ea65c6b7..3b067be0f 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp
+++ b/ReactAndroid/src/main/jni/xreact/jni/OnLoad.cpp
@@ -2,8 +2,8 @@
 
 #include <folly/dynamic.h>
 #include <fb/fbjni.h>
+#include <fb/glog_init.h>
 #include <fb/log.h>
-#include <fb/xplat_init.h>
 #include <cxxreact/Executor.h>
 #include <cxxreact/JSCExecutor.h>
 #include <cxxreact/Platform.h>
@@ -145,7 +145,8 @@ class JReactMarker : public JavaClass<JReactMarker> {
 }
 
 extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  return xplat::initialize(vm, [] {
+  return initialize(vm, [] {
+    gloginit::initialize();
     // Inject some behavior into react/
     ReactMarker::logMarker = JReactMarker::logMarker;
     WebWorkerUtil::createWebWorkerThread = WebWorkers::createWebWorkerThread;