Use loadLibraryUnsafe where needed

Nikolai Tillmann · facebook-github-bot · commit 7832805a2928 · 2024-09-30T21:25:47.000-07:00
Reviewed By: adicatana

Differential Revision: D63471298

fbshipit-source-id: e00768709dde855500de6fc88ffbcb4f54667fec
diff --git a/java/com/facebook/soloader/NativeLibrary.java b/java/com/facebook/soloader/NativeLibrary.java
@@ -59,7 +59,7 @@ public boolean loadLibraries() {
       try {
         if (mLibraryNames != null) {
           for (String name : mLibraryNames) {
-            SoLoader.loadLibrary(name);
+            SoLoader.loadLibraryUnsafe(name);
           }
         }
         initialNativeCheck();
diff --git a/java/com/facebook/soloader/NativeLoaderToSoLoaderDelegate.java b/java/com/facebook/soloader/NativeLoaderToSoLoaderDelegate.java
@@ -26,7 +26,7 @@ public boolean loadLibrary(String shortName, int flags) {
     int soLoaderFlags = 0;
     soLoaderFlags |=
         ((flags & SKIP_MERGED_JNI_ONLOAD) != 0) ? SoLoader.SOLOADER_SKIP_MERGED_JNI_ONLOAD : 0;
-    return SoLoader.loadLibrary(shortName, soLoaderFlags);
+    return SoLoader.loadLibraryUnsafe(shortName, soLoaderFlags);
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public boolean loadLibraries() {`
`59`	`59`	`try {`
`60`	`60`	`if (mLibraryNames != null) {`
`61`	`61`	`for (String name : mLibraryNames) {`
`62`		`- SoLoader.loadLibrary(name);`
	`62`	`+ SoLoader.loadLibraryUnsafe(name);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`initialNativeCheck();`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public boolean loadLibrary(String shortName, int flags) {`
`26`	`26`	`int soLoaderFlags = 0;`
`27`	`27`	`soLoaderFlags \|=`
`28`	`28`	`((flags & SKIP_MERGED_JNI_ONLOAD) != 0) ? SoLoader.SOLOADER_SKIP_MERGED_JNI_ONLOAD : 0;`
`29`		`- return SoLoader.loadLibrary(shortName, soLoaderFlags);`
	`29`	`+ return SoLoader.loadLibraryUnsafe(shortName, soLoaderFlags);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`