diff options
| -rw-r--r-- | android/CustomTarget_lo_android.mk | 2 | ||||
| -rw-r--r-- | android/source/Makefile | 4 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 10 |
4 files changed, 14 insertions, 3 deletions
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 a095f430464b..51125374491d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -110,6 +110,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 14182d154939..e30d0cc938b6 100644 --- a/configure.ac +++ b/configure.ac @@ -526,6 +526,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 |