Back out "Back out "[soloader] add base apk paths from classloader in…

…to directAPK soSource""

Summary: Original commit changeset: 9ac080eac961

Reviewed By: simpleton, adicatana

Differential Revision: D51447843

fbshipit-source-id: 5d2769d0fb31178784d41f458c09cf8825d85ad0

java/com/facebook/soloader/DirectApkSoSource.java

@@ -115,6 +115,17 @@ public String getLibraryPath(String soName) throws IOException {
   /*package*/ static Set<String> getDirectApkLdPaths(Context context) {
     Set<String> directApkPathSet = new HashSet<>();
 
+    final String classLoaderLdLibraryPath = SysUtil.getClassLoaderLdLoadLibrary();
+    if (classLoaderLdLibraryPath != null) {
+      LogUtil.w(SoLoader.TAG, "ClassLoader LdLibrary Path: " + classLoaderLdLibraryPath);
+      final String[] paths = classLoaderLdLibraryPath.split(":");
+      for (final String path : paths) {
+        if (path.contains(".apk!/")) {
+          directApkPathSet.add(path);
+        }
+      }
+    }
+
     final String apkPath = context.getApplicationInfo().sourceDir;
     final @Nullable String fallbackApkLdPath = getFallbackApkLdPath(apkPath);
     if (fallbackApkLdPath != null) {