Do not call onLoadLibraryEnd if onLoadLibraryStart failed

Summary: . Differential Revision: D54245030 fbshipit-source-id: 3b8a2e4dd1828cc57a58c0f32c531674057a14d3
facebook · Mar 7, 2024 · 57f2556 · 57f2556
1 parent 0f97bdd
commit 57f2556
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/java/com/facebook/soloader/SoLoader.java b/java/com/facebook/soloader/SoLoader.java
@@ -778,10 +778,10 @@ public static boolean loadLibrary(String shortName, int loadFlags) throws Unsati
   @SuppressLint({"CatchGeneralException", "EmptyCatchBlock"})
   private static boolean loadLibraryOnAndroid(String shortName, int loadFlags) {
     @Nullable Throwable failure = null;
+    String mergedLibName = MergedSoMapping.mapLibName(shortName);
+    String soName = mergedLibName != null ? mergedLibName : shortName;
+    ObserverHolder.onLoadLibraryStart(shortName, mergedLibName, loadFlags);
     try {
-      String mergedLibName = MergedSoMapping.mapLibName(shortName);
-      String soName = mergedLibName != null ? mergedLibName : shortName;
-      ObserverHolder.onLoadLibraryStart(shortName, mergedLibName, loadFlags);
       return loadLibraryBySoName(
           System.mapLibraryName(soName), shortName, mergedLibName, loadFlags, null);
     } catch (Throwable t) {