Trigger unpacking when /data/app/../lib/arm does not exist

Reviewed By: michalgr

Differential Revision: D62753901

fbshipit-source-id: c936ccdb933fd2170c60c209f14a02d693129838

Author: adicatana

java/com/facebook/soloader/recovery/CheckOnDiskStateDataApp.java

@@ -46,48 +46,62 @@ public boolean recover(UnsatisfiedLinkError error, SoSource[] soSources) {
 
     File nativeLibStandardDir = new File(mContext.getApplicationInfo().nativeLibraryDir);
     if (!nativeLibStandardDir.exists()) {
-      LogUtil.e(
-          SoLoader.TAG,
-          "Native library directory "
-              + nativeLibStandardDir
-              + " does not exist, exiting /data/app recovery.");
-      return false;
-    }
+      for (SoSource soSource : soSources) {
+        if (!(soSource instanceof BackupSoSource)) {
+          continue;
+        }
+        BackupSoSource uss = (BackupSoSource) soSource;
+        try {
 
-    ArrayList<String> missingLibs = new ArrayList<>();
-    for (SoSource soSource : soSources) {
-      if (!(soSource instanceof BackupSoSource)) {
-        continue;
+          LogUtil.e(
+              SoLoader.TAG,
+              "Native library directory "
+                  + nativeLibStandardDir
+                  + " does not exist, will unpack everything under /data/data.");
+          uss.prepare(0);
+          break;
+        } catch (Exception e) {
+          LogUtil.e(
+              SoLoader.TAG, "Encountered an exception while recovering from /data/app failure ", e);
+          return false;
+        }
       }
-      BackupSoSource uss = (BackupSoSource) soSource;
-      try {
-        Dso[] dsosFromArchive = uss.getDsosBaseApk();
-        for (Dso dso : dsosFromArchive) {
-          File soFile = new File(nativeLibStandardDir, dso.name);
-          if (soFile.exists()) {
-            continue;
-          }
-          missingLibs.add(dso.name);
+    } else {
+      ArrayList<String> missingLibs = new ArrayList<>();
+      for (SoSource soSource : soSources) {
+        if (!(soSource instanceof BackupSoSource)) {
+          continue;
         }
+        BackupSoSource uss = (BackupSoSource) soSource;
+        try {
+          Dso[] dsosFromArchive = uss.getDsosBaseApk();
+          for (Dso dso : dsosFromArchive) {
+            File soFile = new File(nativeLibStandardDir, dso.name);
+            if (soFile.exists()) {
+              continue;
+            }
+            missingLibs.add(dso.name);
+          }
 
-        if (missingLibs.isEmpty()) {
-          LogUtil.e(SoLoader.TAG, "No libraries missing from " + nativeLibStandardDir);
+          if (missingLibs.isEmpty()) {
+            LogUtil.e(SoLoader.TAG, "No libraries missing from " + nativeLibStandardDir);
+            return false;
+          }
+
+          LogUtil.e(
+              SoLoader.TAG,
+              "Missing libraries from "
+                  + nativeLibStandardDir
+                  + ": "
+                  + missingLibs.toString()
+                  + ", will run prepare on tbe backup so source");
+          uss.prepare(0);
+          break;
+        } catch (Exception e) {
+          LogUtil.e(
+              SoLoader.TAG, "Encountered an exception while recovering from /data/app failure ", e);
           return false;
         }
-
-        LogUtil.e(
-            SoLoader.TAG,
-            "Missing libraries from "
-                + nativeLibStandardDir
-                + ": "
-                + missingLibs.toString()
-                + ", will run prepare on tbe backup so source");
-        uss.prepare(0);
-        break;
-      } catch (Exception e) {
-        LogUtil.e(
-            SoLoader.TAG, "Encountered an exception while recovering from /data/app failure ", e);
-        return false;
       }
     }