android: Allow setting of the app name via --with-app-name too.

Change-Id: I8c8da8b4872724daf72841f2bf36fdff9ac53df6
This commit is contained in:
Jan Holesovsky 2019-04-12 18:05:31 +02:00
parent 0be4eee313
commit 6746ef981d
3 changed files with 4 additions and 1 deletions

View file

@ -14,6 +14,7 @@ android {
}
buildTypes {
debug {
resValue "string", "app_name", "${liboAppName}"
ndk {
//abiFilters "x86", "armeabi-v7a", "armeabi"
abiFilters "armeabi-v7a"
@ -21,6 +22,7 @@ android {
debuggable true
}
release {
resValue "string", "app_name", "${liboAppName}"
ndk {
abiFilters "armeabi-v7a"
}

View file

@ -11,6 +11,7 @@ ext {
liboVersionMajor = '@LOOLWSD_VERSION_MAJOR@'
liboVersionMinor = '@LOOLWSD_VERSION_MAJOR@'
liboGitFullCommit = '@LOOLWSD_VERSION_HASH@'
liboAppName = '@APP_NAME@'
}
android.defaultConfig {
applicationId 'org.libreoffice.androidapp'

View file

@ -1,5 +1,5 @@
<resources>
<string name="app_name">OnlineApp</string>
<!--string name="app_name" definition is deliberately missing here, it is filled in in build.gradle.-->
<string name="app_version">Version: %1$s\nBuild ID: %2$s</string>
<string name="app_description">LibreOffice Viewer is a document viewer based on LibreOffice.</string>