From b32d3843373445b4e76c9896b6a5cf2a5e9a3357 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

Summary: To make the library easier to get started with we don't want to force people to use SoLoader. If SoLoader is not initialized we will fall back to the standard System.loadLibrary() method.

Reviewed By: lucasr

Differential Revision: D3661990

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

diff --git a/java/com/facebook/csslayout/CSSNodeJNI.java b/java/com/facebook/csslayout/CSSNodeJNI.java
index b6a37fe5..2c84f9c1 100644
--- a/java/com/facebook/csslayout/CSSNodeJNI.java
+++ b/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;