Makefile.in | 1 -
android/.gitignore | 1 -
android/source/Makefile | 6 +++---
android/source/build.gradle | 14 +-------------
android/source/res/values/themes.xml | 4 ----
5 files changed, 4 insertions(+), 22 deletions(-)
New commits:
commit d93a9e5868d4c54fc17d8881e1c01eb048642c35
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Jul 10 12:01:44 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Jul 11 07:08:56 2025 +0200
android: Drop unused LibreOfficeTheme.NavigationView
Unused since
commit a23bd42e9b2f6401c710ac95afcc3aa8f360d65c
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Tue Apr 6 14:26:06 2021 +0200
android: Drop custom file abstraction + UI
Change-Id: I01da7a0f2c2a0f5b28262984048a0328de0e846b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187624
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/android/source/res/values/themes.xml
b/android/source/res/values/themes.xml
index bf815b5c659f..99be869fbef7 100644
--- a/android/source/res/values/themes.xml
+++ b/android/source/res/values/themes.xml
@@ -14,10 +14,6 @@
<style name="LibreOfficeTheme.Toolbar"
parent="Theme.AppCompat.DayNight.NoActionBar">
</style>
- <style name="LibreOfficeTheme.NavigationView">
- <item name="colorPrimary">@android:color/black</item>
- </style>
-
<style name="NewDocumentTextView">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
commit ac43e554935bf6e39d3c15e31d9e3535a3e6449d
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Jul 10 08:31:51 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Jul 11 07:08:47 2025 +0200
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 <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/Makefile.in b/Makefile.in
index 6b167dfec6a0..cedf1a89011b 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 9dcb83ce2f2a..4a2d6da4cf4d 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'
