Remove Relinker recursive loading workaround

opendocument-app · Jan 3, 2024 · 766fa78 · 766fa78
1 parent ec5ded5
commit 766fa78
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/wvWare/src/main/java/com/viliussutkus89/android/wvware/wvWare.java b/wvWare/src/main/java/com/viliussutkus89/android/wvware/wvWare.java
@@ -66,14 +66,9 @@ public wvWare(@NonNull Context ctx) {
   }
 
   private synchronized void init(@NonNull Context ctx) {
+    ReLinker.recursively().loadLibrary(ctx, "wvware-android");
     Tmpfile.init(ctx.getCacheDir());
 
-    ReLinkerInstance reLinker = ReLinker.recursively();
-    // https://github.com/KeepSafe/ReLinker/issues/77
-    // Manually load dependencies, because ReLinker.recursively() doesn't actually load recursively
-    reLinker.loadLibrary(ctx, "c++_shared");
-    reLinker.loadLibrary(ctx, "wvware-android");
-
     LegacyCleanup.cleanup(ctx);
 
     AssetExtractor ae = new AssetExtractor(ctx.getAssets()).setNoOverwrite();