From 44e7a88620427efc93896b6b76b58c448a15f9e5 Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Thu, 4 Aug 2016 08:20:06 -0700
Subject: [PATCH] Fallback to System.loadLibrary if SoLoader has not been
 initialized

Reviewed By: lucasr

Differential Revision: D3661990

fbshipit-source-id: f2003577aa3d2f89ec579b6f889fdfb684110b60
---
 .../src/main/java/com/facebook/csslayout/CSSNodeJNI.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeJNI.java b/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeJNI.java
index b6a37fe5e..2c84f9c12 100644
--- a/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeJNI.java
+++ b/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeJNI.java
@@ -20,7 +20,13 @@ import com.facebook.soloader.SoLoader;
 public class CSSNodeJNI implements CSSNodeAPI<CSSNodeJNI> {
 
   static {
-    SoLoader.loadLibrary("csslayout");
+    try {
+      SoLoader.loadLibrary("csslayout");
+    } catch (Exception ignored) {
+      // The user probably didn't call SoLoader.init(). Fall back to System.loadLibrary() instead.
+      System.out.println("Falling back to System.loadLibrary()");
+      System.loadLibrary("csslayout");
+    }
   }
 
   private CSSNodeJNI mParent;