summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-02-15 11:46:36 +0100
committerJan Holesovsky <kendy@collabora.com>2019-10-09 10:37:31 +0200
commite7fe5ad0a972bf9b4a629ad117e23f1a30f45d89 (patch)
treee2343028a0c529e8d37009bb5a92b6e847f86d0c /android
parent875a1fb46293cd9209bd557b4a4f154bf091d9cb (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> Reviewed-on: https://gerrit.libreoffice.org/80269 Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'android')
-rw-r--r--android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java5
-rw-r--r--android/Bootstrap/version.map2
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:
*;
};