diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-02-15 16:01:55 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-03-11 17:46:09 +0100 |
| commit | bd050920ffdeb694d0b4a8feaf72625626e851d7 (patch) | |
| tree | 4792e07c5fa0235a31ef560bf638249de0322dbc /android | |
| parent | android: Separate the Android-specific setup from the actual LOK init. (diff) | |
| download | core-bd050920ffdeb694d0b4a8feaf72625626e851d7.tar.gz core-bd050920ffdeb694d0b4a8feaf72625626e851d7.zip | |
android: Set the FONTCONFIG_FILE envvar to the fonts.conf (if exists).
Change-Id: Ic9fd97a2ff8a6d96ffcc7ad300ef30201d786528
Reviewed-on: https://gerrit.libreoffice.org/67876
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 | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java index ce84b7409c1f..f6658d64806a 100644 --- a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java +++ b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java @@ -67,19 +67,6 @@ public final class LibreOfficeKit String cacheDir = activity.getApplication().getCacheDir().getAbsolutePath(); String apkFile = activity.getApplication().getPackageResourcePath(); - // If there is a fonts.conf file in the apk that can be extracted, automatically - // set the FONTCONFIG_FILE env var. - InputStream inputStream; - try { - inputStream = activity.getAssets().open("unpack/etc/fonts/fonts.conf"); - } catch (java.io.IOException exception) { - inputStream = null; - } - - if (inputStream != null) { - putenv("FONTCONFIG_FILE=" + dataDir + "/etc/fonts/fonts.conf"); - } - if (!initializeNative(dataDir, cacheDir, apkFile, mgr)) { Log.e(LOGTAG, "Initialize native failed!"); return; |