diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-12-03 10:39:51 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-12-03 14:33:20 +0100 |
| commit | 5f9e088fe614491975357dd385404f6013badb00 (patch) | |
| tree | 22463e75cf05bc23c23bea60a49f3d56171659c4 /android | |
| parent | f1776b92670e3143ede418c0f2b46ec9819b68bd (diff) | |
android: Replace the value in fonts with real name instead of 'null'.
Change-Id: Iefb5737662eb5463429951c815e5bb0891abd875
Reviewed-on: https://gerrit.libreoffice.org/84313
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'android')
| -rw-r--r-- | android/lib/build.gradle | 2 | ||||
| -rw-r--r-- | android/lib/libSettings.gradle.in | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/android/lib/build.gradle b/android/lib/build.gradle index dcce0172e..631524dce 100644 --- a/android/lib/build.gradle +++ b/android/lib/build.gradle @@ -93,7 +93,7 @@ task copyUnpackAssets(type: Copy) { filter { String line -> line.replaceAll( - '@@APPLICATION_ID@@', new String("${android.defaultConfig.applicationId}") + '@@APPLICATION_ID@@', new String("${liboApplicationId}") ).replaceAll( // FIXME Avoid the Android system fonts for the moment, // the huge Noto Sans fonts have terrible impact on the 1st diff --git a/android/lib/libSettings.gradle.in b/android/lib/libSettings.gradle.in index 3736a35fe..bd40967c3 100644 --- a/android/lib/libSettings.gradle.in +++ b/android/lib/libSettings.gradle.in @@ -8,4 +8,5 @@ ext { liboVersionMajor = '@LOOLWSD_VERSION_MAJOR@' liboVersionMinor = '@LOOLWSD_VERSION_MAJOR@' liboGitFullCommit = '@LOOLWSD_VERSION_HASH@' + liboApplicationId = '@ANDROID_PACKAGE_NAME@' } |