diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-11-21 15:18:30 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-21 15:22:27 +0200 |
commit | ae81246917f581a7a498a371b9a6137cde542b3e (patch) | |
tree | e47c44ab952aa4d8fad28da352d5ebdfcb3dbf91 /android | |
parent | 1c84f6f475a448333f844b0e25d895d117b90563 (diff) |
We don't need the library search path anymore
As we don't use any dlopen() etc wrappers now with just one single
DSO, we have no use for the library search path either.
Change-Id: Ifaf11c4785a90fe5c7dafb3310bc7933ea31238c
Diffstat (limited to 'android')
-rw-r--r-- | android/Bootstrap/src/org/libreoffice/android/Bootstrap.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java index 7b01eb89921e..3db58446e740 100644 --- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java +++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java @@ -60,8 +60,7 @@ public class Bootstrap extends NativeActivity private static native boolean setup(String dataDir, String cacheDir, - String apkFile, - String[] ld_library_path); + String apkFile); public static native boolean setup(Object lo_main_argument, int lo_main_delay); @@ -128,16 +127,9 @@ public class Bootstrap extends NativeActivity redirect_stdio(true); - String llp = System.getenv("LD_LIBRARY_PATH"); - if (llp == null) - llp = "/vendor/lib:/system/lib"; - - String[] llpa = llp.split(":"); - if (!setup(dataDir, activity.getApplication().getCacheDir().getAbsolutePath(), - activity.getApplication().getPackageResourcePath(), - llpa)) + activity.getApplication().getPackageResourcePath())) return; // Extract files from the .apk that can't be used mmapped directly from it |