System libraries should be implicitly loaded by dlopen()

Differential Revision: D58235364

fbshipit-source-id: 56b648c33a2736034bd3cee78ceb5fff3bda3984

java/com/facebook/soloader/NativeDeps.java

@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -53,6 +54,24 @@ public final class NativeDeps {
   private static volatile boolean sUseDepsFileAsync = false;
   private static final ReentrantReadWriteLock sWaitForDepsFileLock = new ReentrantReadWriteLock();
 
+  private static final HashSet<String> STANDARD_SYSTEM_LIBS =
+      new HashSet<String>() {
+        {
+          add("libEGL.so");
+          add("libGLESv2.so");
+          add("libGLESv3.so");
+          add("libOpenSLES.so");
+          add("libandroid.so");
+          add("libc.so");
+          add("libdl.so");
+          add("libjnigraphics.so");
+          add("liblog.so");
+          add("libm.so");
+          add("libstdc++.so");
+          add("libz.so");
+        }
+      };
+
   public static void loadDependencies(
       String soName, ElfByteChannel bc, int loadFlags, StrictMode.ThreadPolicy threadPolicy)
       throws IOException {
@@ -64,6 +83,11 @@ public static void loadDependencies(
         continue;
       }
 
+      if (STANDARD_SYSTEM_LIBS.contains(dependency)) {
+        // The linker will implicitly load these by itself.
+        continue;
+      }
+
       SoLoader.loadDependency(dependency, loadFlags, threadPolicy);
     }
   }
@@ -153,7 +177,6 @@ public void run() {
               sUseDepsFileAsync = false;
             }
           }
-          ;
         };
 
     new Thread(runnable, "soloader-nativedeps-init").start();