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'