LibreOffice/core
1
0
Fork 0
mirror of https://github.com/LibreOffice/core.git synced 2025-07-23 04:42:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

android: Drop non-working fullUI build variant

Browse Source 
That build variant whose build could be triggered
e.g. by running

    ./gradlew assembleFullUIRelease

from `android/source` would fail to build for
a long time already, like this:

  /home/michi/development/git/libreoffice-WORKTREE-android/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java:189: error: cannot find symbol
          final boolean bEditingEnabled = BuildConfig.ALLOW_EDITING && preferences.getBoolean(LibreOfficeMainActivity.ENABLE_EXPERIMENTAL_PREFS_KEY, false);
                                                     ^
    symbol:   variable ALLOW_EDITING
    location: class BuildConfig

In addition, it would be the default variant
used by Android Studio, so in order to get
a working build, it was always necessary to
explicitly switch to another variant first
(using "Build" -> "Select build variant").

Drop it altogether, since it's unused.
(It would include all of the .ui files
in the APK while the other build variants
explicitly specify what files to include.)

Change-Id: I0a6096ec69897eb57f41c512e88a4c1a848480ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187623
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
This commit is contained in:
Michael Weghorn
2025-07-10 08:31:51 +02:00
parent e9632c5d3a
commit ac43e55493
4 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -199,7 +199,6 @@ ifeq ($(OS),ANDROID)
rm -fr $(BUILDDIR)/android/jniLibs
rm -fr $(SRCDIR)/android/source/build
rm -fr $(SRCDIR)/android/source/assets
rm -fr $(SRCDIR)/android/source/assets_fullUI
rm -fr $(SRCDIR)/android/source/assets_strippedUI
rm -fr $(SRCDIR)/android/source/res_generated
endif

1
android/.gitignore vendored
View File

@ -1,7 +1,6 @@
/source/.gradle/
/source/.idea/
/source/assets/
/source/assets_fullUI/
/source/assets_strippedUI/
/source/build/
/source/captures/

6
android/source/Makefile
View File

@ -8,7 +8,7 @@ endif
all: build-gradle
DISABLE_UI=TRUE
BUILD_VARIANT=$(if $(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_ANDROID_EDITING),Editing)$(if $(ENABLE_RELEASE_BUILD),Release,Debug)
BUILD_VARIANT=$(if $(DISABLE_UI),StrippedUI)$(if $(ENABLE_ANDROID_EDITING),Editing)$(if $(ENABLE_RELEASE_BUILD),Release,Debug)
BOOTSTRAPDIR=../Bootstrap
include $(BOOTSTRAPDIR)/Makefile.shared
@ -17,14 +17,14 @@ native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
$< -j -g core -g writer -g calc -g draw -g edit > $@
install:
if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then ./gradlew $(if $(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode)) install$(if $(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_ANDROID_EDITING),Editing)Debug ; fi
if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then ./gradlew $(if $(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode)) install$(if $(DISABLE_UI),StrippedUI)$(if $(ENABLE_ANDROID_EDITING),Editing)Debug ; fi
@if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then echo ; echo 'Run it with "make run"' ; echo ; fi
uninstall:
$(ANDROID_SDK_DIR)/platform-tools/adb uninstall $(ANDROID_PACKAGE_NAME)
clean:
rm -rf assets assets_fullUI assets_strippedUI build jniLibs jniLibs_debug res_generated $(OBJLOCAL)
rm -rf assets assets_strippedUI build jniLibs jniLibs_debug res_generated $(OBJLOCAL)
rm -f native-code.cxx
rm -f liboSettings.gradle

14
android/source/build.gradle
View File

@ -55,8 +55,6 @@ android {
main.res.srcDirs = ['res', 'res_generated']
main.java.srcDirs = ['../Bootstrap/src', 'src/java']
main.jniLibs.srcDirs = ["${liboJniLibsdir}"]
// the configuration data that might be stripped or not
fullUI.assets.srcDirs 'assets_fullUI'
strippedUI.assets.srcDirs 'assets_strippedUI'
strippedUIEditing.assets.srcDirs 'assets_strippedUI'
}
@ -87,7 +85,6 @@ android {
dimension "default"
buildConfigField 'boolean', 'ALLOW_EDITING', 'true'
}
fullUI.dimension "default"
}
lint {
warningsAsErrors true
@ -220,13 +217,6 @@ task copyAppResources(type: Copy) {
}
}
task createFullConfig(type: Copy) {
// grab dir to clear whole hierarchy on clean target
outputs.dir "assets_fullUI"
into 'assets_fullUI/share/config/soffice.cfg'
from "${liboInstdir}/share/config/soffice.cfg"
}
task createStrippedConfig {
def preserveDir = file("assets_strippedUI/share/config/soffice.cfg/empty")
outputs.dir "assets_strippedUI"
@ -318,9 +308,7 @@ task createRCfiles {
preBuild.dependsOn 'createRCfiles',
'createStrippedConfigMain',
'createStrippedConfigRegistry',
'createFullConfig',
'copyAppResources'
clean.dependsOn 'cleanCopyAssets',
'cleanCreateStrippedConfig',
'cleanCreateFullConfig'
'cleanCreateStrippedConfig'