Fallback to PlainAssetSoSource in case compression can't be found for…

… modules

Summary:
After D53000687, we'll need to support voltron modules with deflated asset libraries, e.g. for debug builds. See test plan for more explanations.

XZ is slow, so we were in fact wasting up to 90 seconds compressing libraries even for debug builds. After the whole stack lands, debug builds should be faster.

Reviewed By: michalgr

Differential Revision: D53108461

fbshipit-source-id: b5bc65de47dbcb05f7eabfcf21f6b374f3428551

java/com/facebook/soloader/ExtractFromZipSoSource.java

@@ -54,6 +54,13 @@ public ExtractFromZipSoSource(
     mZipSearchPattern = zipSearchPattern;
   }
 
+  public ExtractFromZipSoSource(
+      Context context, File storePath, File zipFileName, String zipSearchPattern) {
+    super(context, storePath);
+    mZipFileName = zipFileName;
+    mZipSearchPattern = zipSearchPattern;
+  }
+
   @Override
   public String getName() {
     return "ExtractFromZipSoSource";
@@ -93,8 +100,9 @@ ZipDso[] computeDsosFromZip() {
         if (!m.matches()) {
           continue;
         }
-        String libraryAbi = m.group(1);
-        String soName = m.group(2);
+        int soNameIdx = m.groupCount();
+        String libraryAbi = m.group(soNameIdx - 1);
+        String soName = m.group(soNameIdx);
         int abiScore = SysUtil.findAbiScore(supportedAbis, libraryAbi);
         if (abiScore < 0) {
           continue;