diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-02-15 11:46:36 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-03-11 17:45:56 +0100 |
| commit | cb6d77987c614449a42162541ec3afa36a2959e7 (patch) | |
| tree | 1b671ce3252299d832983ad5ebc6c4010403b940 /android | |
| parent | f43483ce36b8a50ecc9266f26bc7b4ac302c6661 (diff) | |
android: Separate the Android-specific setup from the actual LOK init.
Change-Id: I433376dfea0a43c63827ba15308a614f3466fb71
Reviewed-on: https://gerrit.libreoffice.org/67875
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'android')
| -rw-r--r-- | android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java | 5 | ||||
| -rw-r--r-- | android/Bootstrap/version.map | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java index c82f7b16b01a..ce84b7409c1f 100644 --- a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java +++ b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java @@ -76,15 +76,10 @@ public final class LibreOfficeKit inputStream = null; } - putenv("OOO_DISABLE_RECOVERY=1"); - if (inputStream != null) { putenv("FONTCONFIG_FILE=" + dataDir + "/etc/fonts/fonts.conf"); } - // TMPDIR is used by osl_getTempDirURL() - putenv("TMPDIR=" + cacheDir); - if (!initializeNative(dataDir, cacheDir, apkFile, mgr)) { Log.e(LOGTAG, "Initialize native failed!"); return; diff --git a/android/Bootstrap/version.map b/android/Bootstrap/version.map index de561bfc296b..930e1e071999 100644 --- a/android/Bootstrap/version.map +++ b/android/Bootstrap/version.map @@ -3,7 +3,7 @@ dummy { Java_*; JNI_OnLoad; _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions - libreofficekit_hook*; + libreofficekit_*; local: *; }; |