android/lib/build.gradle | 6 +++---
android/lib/libSettings.gradle.in | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit efea5137fc4d9620ad92ba6e7a865509cf74c4d7
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Fri Aug 7 14:23:11 2020 +0200
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Fri Aug 7 15:09:49 2020 +0200
android: Show the real core git hash in the About dialog.
In the editing activity.
Change-Id: I87190044b501d80f83600b8a146c4d77a5f4e4f7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100228
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index 6177d0ca5..90fb964f5 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -26,7 +26,7 @@ android {
buildTypes {
debug {
resValue "string", "app_name", "${liboAppName} Debug"
- buildConfigField "String", "GIT_COMMIT", "\"${liboGitFullCommit}\""
+ buildConfigField "String", "GIT_COMMIT", "\"${liboOVersionHash}\""
buildConfigField "boolean", "GOOGLE_PLAY_ENABLED",
"${liboGooglePlay}"
ndk {
abiFilters = []
@@ -36,7 +36,7 @@ android {
}
release {
resValue "string", "app_name", "${liboAppName}"
- buildConfigField "String", "GIT_COMMIT", "\"${liboGitFullCommit}\""
+ buildConfigField "String", "GIT_COMMIT", "\"${liboOVersionHash}\""
buildConfigField "boolean", "GOOGLE_PLAY_ENABLED",
"${liboGooglePlay}"
ndk {
abiFilters = []
@@ -278,7 +278,7 @@ UNO_USER_PACKAGES_CACHE=$UNO_USER_PACKAGES/cache
[Version]
AllLanguages=en-US
BuildVersion=
-buildid=''' + "${liboGitFullCommit}" + '''
+buildid=''' + "${liboCoreVersionHash}" + '''
ReferenceOOoMajorMinor=4.1
'''.stripIndent()
}
diff --git a/android/lib/libSettings.gradle.in
b/android/lib/libSettings.gradle.in
index afa68ee1f..a4fe37d66 100644
--- a/android/lib/libSettings.gradle.in
+++ b/android/lib/libSettings.gradle.in
@@ -8,7 +8,8 @@ ext {
liboExampleDocument = '@LOBUILDDIR@/android/default-document/example.odt'
liboVersionMajor = '@LOOLWSD_VERSION_MAJOR@'
liboVersionMinor = '@LOOLWSD_VERSION_MAJOR@'
- liboGitFullCommit = '@LOOLWSD_VERSION_HASH@'
+ liboOVersionHash = '@LOOLWSD_VERSION_HASH@'
+ liboCoreVersionHash = '@CORE_VERSION_HASH@'
liboApplicationId = '@ANDROID_PACKAGE_NAME@'
liboBrandingDir = '@APP_BRANDING_DIR@'
liboAndroidAbi = '@ANDROID_ABI@'
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
