Add an "extra" called lo-extra-libs for a list of libs to load early

Change-Id: I41900eca9a46acbd2f1dfac98fcfc73a62acc150

1 files changed, 11 insertions, 0 deletions

diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index da764abdf139..a799f44175c1 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -220,6 +220,17 @@ public class Bootstrap extends NativeActivity
             return;
         }
 
+        // Get extra libraries to load early, so that it's easier to debug
+        // them even with a buggy ndk-gdb that doesn't grok debugging
+        // information from libraries loaded after it has been attached to the
+        // process.
+        String extraLibs = getIntent().getStringExtra("lo-extra-libs");
+        if (extraLibs != null) {
+            for (String lib : extraLibs.split(":")) {
+                dlopen(lib);
+            }
+        }
+
         // Start a strace on ourself if requested.
 
         // Note that the started strace will have its stdout and