[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - android/lib

[Jan Holesovsky (via logerrit)]

 android/lib/build.gradle          |    6 +++---
 android/lib/libSettings.gradle.in |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 757339187fb624a2a960ca1dbe3dd592d0419b56
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Aug 7 14:23:11 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Aug 7 15:10:22 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/+/100314
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index 2a6c79f63..626466b05 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@'