From 11bc97b16c7804b0e7d70b5539dc8da00d780ee8 Mon Sep 17 00:00:00 2001
From: Lior Tubi <tubi@fb.com>
Date: Mon, 19 Jun 2017 05:37:30 -0700
Subject: [PATCH] Don't load fb native library

Summary: We don't bundle this library with the yoga source, and it isn't needed.

Reviewed By: emilsjolander

Differential Revision: D5274172

fbshipit-source-id: fec47d2700da86498410fe445d2980f31a563551
---
 lib/fb/src/main/java/com/facebook/jni/Countable.java         | 5 -----
 lib/fb/src/main/java/com/facebook/jni/HybridData.java        | 5 -----
 .../src/main/java/com/facebook/jni/ThreadScopeSupport.java   | 5 -----
 3 files changed, 15 deletions(-)

diff --git a/lib/fb/src/main/java/com/facebook/jni/Countable.java b/lib/fb/src/main/java/com/facebook/jni/Countable.java
index a319e187..f8e343da 100644
--- a/lib/fb/src/main/java/com/facebook/jni/Countable.java
+++ b/lib/fb/src/main/java/com/facebook/jni/Countable.java
@@ -3,7 +3,6 @@
 package com.facebook.jni;
 
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.soloader.SoLoader;
 
 /**
  * A Java Object that has native memory allocated corresponding to this instance.
@@ -18,10 +17,6 @@ import com.facebook.soloader.SoLoader;
 @DoNotStrip
 public class Countable {
 
-  static {
-    SoLoader.loadLibrary("fb");
-  }
-
   // Private C++ instance
   @DoNotStrip
   private long mInstance = 0;
diff --git a/lib/fb/src/main/java/com/facebook/jni/HybridData.java b/lib/fb/src/main/java/com/facebook/jni/HybridData.java
index e0b864b0..35803a56 100644
--- a/lib/fb/src/main/java/com/facebook/jni/HybridData.java
+++ b/lib/fb/src/main/java/com/facebook/jni/HybridData.java
@@ -3,7 +3,6 @@
 package com.facebook.jni;
 
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.soloader.SoLoader;
 
 /**
  * This object holds a native C++ member for hybrid Java/C++ objects.
@@ -19,10 +18,6 @@ import com.facebook.soloader.SoLoader;
 @DoNotStrip
 public class HybridData {
 
-  static {
-    SoLoader.loadLibrary("fb");
-  }
-
   // Private C++ instance
   @DoNotStrip
   private long mNativePointer = 0;
diff --git a/lib/fb/src/main/java/com/facebook/jni/ThreadScopeSupport.java b/lib/fb/src/main/java/com/facebook/jni/ThreadScopeSupport.java
index 89610c43..bda99d62 100644
--- a/lib/fb/src/main/java/com/facebook/jni/ThreadScopeSupport.java
+++ b/lib/fb/src/main/java/com/facebook/jni/ThreadScopeSupport.java
@@ -3,14 +3,9 @@
 package com.facebook.jni;
 
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.soloader.SoLoader;
 
 @DoNotStrip
 public class ThreadScopeSupport {
-  static {
-    SoLoader.loadLibrary("fb");
-  }
-
   // This is just used for ThreadScope::withClassLoader to have a java function
   // in the stack so that jni has access to the correct classloader.
   @DoNotStrip