Makefile.in | 1 - android/.gitignore | 1 - android/source/Makefile | 6 +++--- android/source/build.gradle | 17 ++--------------- 4 files changed, 5 insertions(+), 20 deletions(-)
New commits: commit 334cc3e962873dd5285b16b8ecfc99858c690249 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Nov 25 20:34:56 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Nov 28 10:43:21 2025 +0100 android: Deduplicate assets specification in build.gradle It's the same for both product flavors, so define it once for the main one that is the base for both of them, and all upcoming flavors, too. Change-Id: I0532332c0780bac5099a2d98601664b3cf709777 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194531 Tested-by: Jenkins Code-Style: Michael Weghorn <[email protected]> Reviewed-by: Michael Weghorn <[email protected]> (cherry picked from commit 72f7e3e5c5bccd0c21685e5e37751c1140cc6a87) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194538 Code-Style: Xisco Fauli <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194629 diff --git a/android/source/build.gradle b/android/source/build.gradle index bae03eb8ce9d..85b76eeee62f 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -55,8 +55,7 @@ android { main.res.srcDirs = ['res', 'res_generated'] main.java.srcDirs = ['../Bootstrap/src', 'src/java'] main.jniLibs.srcDirs = ["${liboJniLibsdir}"] - strippedUI.assets.srcDirs 'assets_strippedUI' - strippedUIEditing.assets.srcDirs 'assets_strippedUI' + main.assets.srcDirs 'assets_strippedUI' } defaultConfig { // minSdkVersion is set in liboSettings.gradle commit d4214fed2b132412510da1e482680ecd8a966822 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jul 10 08:31:51 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Nov 28 10:43:11 2025 +0100 android: Drop non-working fullUI build variant 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 <[email protected]> Tested-by: Jenkins (cherry picked from commit ac43e554935bf6e39d3c15e31d9e3535a3e6449d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194529 Reviewed-by: Xisco Fauli <[email protected]> Code-Style: Xisco Fauli <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194628 diff --git a/Makefile.in b/Makefile.in index 55d27282feef..f693149e6bf5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 diff --git a/android/.gitignore b/android/.gitignore index de608fea3c14..b8e2e1d1cccd 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -1,7 +1,6 @@ /source/.gradle/ /source/.idea/ /source/assets/ -/source/assets_fullUI/ /source/assets_strippedUI/ /source/build/ /source/captures/ diff --git a/android/source/Makefile b/android/source/Makefile index 2c1d6f9f1cca..284563c4466c 100644 --- a/android/source/Makefile +++ b/android/source/Makefile @@ -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 diff --git a/android/source/build.gradle b/android/source/build.gradle index a91bca1583a0..bae03eb8ce9d 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -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'
