[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - android/CustomTarget_lo_android.mk android/source config_host.mk.in configure.ac

[Stephan Bergmann (via logerrit)]

 android/CustomTarget_lo_android.mk |    2 +-
 android/source/Makefile            |    4 ++--
 config_host.mk.in                  |    1 +
 configure.ac                       |   10 ++++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 59ffa0b68eec6b11f0453d69a1086457b31a5cbc
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Dec 13 09:43:55 2018 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Jun 17 10:15:14 2019 +0200

    Introduce --enable-android-editing
    
    ...to select the experimental ...Editing... Android build variant.  (Ignored
    for non-Android builds, but using libo_FUZZ_ARG_ENABLE anyway, just in case.)
    
    Change-Id: I670925ff358039e38edc29db69f48a78d484f133
    Reviewed-on: https://gerrit.libreoffice.org/65077
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/74148
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk
index 642dfe2f569a..3f80fe86be3a 100644
--- a/android/CustomTarget_lo_android.mk
+++ b/android/CustomTarget_lo_android.mk
@@ -20,7 +20,7 @@ $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNa
 # still looks for the .apk, and we want fresh daily builds to be uploaded.
 # Us "foo" instead of the old INPATH
 	mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \
-	cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI/debug/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin
+	cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/debug/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin
 
 $(call gb_CustomTarget_get_clean_target,android/loandroid3) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
diff --git a/android/source/Makefile b/android/source/Makefile
index d0242117d1a8..3fbfcddb0dd3 100644
--- a/android/source/Makefile
+++ b/android/source/Makefile
@@ -16,7 +16,7 @@ native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
 	$< -j -g core -g writer -g calc -g draw -g edit > $@
 
 install:
-	./gradlew $(if $(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode)) install$(if $(DISABLE_UI),StrippedUI,FullUI)Debug
+	./gradlew $(if $(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode)) install$(if $(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_ANDROID_EDITING),Editing)Debug
 	@echo
 	@echo 'Run it with "make run"'
 	@echo
@@ -30,7 +30,7 @@ clean:
 	rm -f liboSettings.gradle
 
 build-gradle: liboSettings.gradle local.properties link-so
-	./gradlew $(if $(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode)) assemble$(if $(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_RELEASE_BUILD),Release,Debug)
+	./gradlew $(if $(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode)) assemble$(if $(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_ANDROID_EDITING),Editing)$(if $(ENABLE_RELEASE_BUILD),Release,Debug)
 
 run:
 	$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(ANDROID_PACKAGE_NAME)/.ui.LibreOfficeUIActivity
diff --git a/config_host.mk.in b/config_host.mk.in
index 96bd80d67868..91678f862520 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -106,6 +106,7 @@ export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@
 export DPKG=@DPKG@
 export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@
 export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@
+export ENABLE_ANDROID_EDITING=@ENABLE_ANDROID_EDITING@
 export ENABLE_AVAHI=@ENABLE_AVAHI@
 export ENABLE_BREAKPAD=@ENABLE_BREAKPAD@
 export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
diff --git a/configure.ac b/configure.ac
index 6687a8d54ff3..eb510df19335 100644
--- a/configure.ac
+++ b/configure.ac
@@ -522,6 +522,16 @@ if test -n "$with_android_sdk"; then
 fi
 AC_SUBST(ANDROID_SDK_HOME)
 
+libo_FUZZ_ARG_ENABLE([android-editing],
+    AS_HELP_STRING([--enable-android-editing],
+        [Enable the experimental editing feature on Android.])
+)
+ENABLE_ANDROID_EDITING=
+if test "$enable_android_editing" = yes; then
+    ENABLE_ANDROID_EDITING=TRUE
+fi
+AC_SUBST([ENABLE_ANDROID_EDITING])
+
 dnl ===================================================================
 dnl The following is a list of supported systems.
 dnl Sequential to keep the logic very simple