android/lib/build.gradle | 2 +-
android/lib/libSettings.gradle.in | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5f9e088fe614491975357dd385404f6013badb00
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Tue Dec 3 10:39:51 2019 +0100
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Tue Dec 3 14:33:20 2019 +0100
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 <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
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@'
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
