mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce --enable-android-editing

Browse Source 
...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@redhat.com>
This commit is contained in:
Stephan Bergmann
2018-12-13 09:43:55 +01:00
parent 868a683138
commit 25a0ae6138
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/CustomTarget_lo_android.mk
View File

@@ -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. # still looks for the .apk, and we want fresh daily builds to be uploaded.
# Us "foo" instead of the old INPATH # Us "foo" instead of the old INPATH
mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \ 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_CustomTarget_get_clean_target,android/loandroid3) :
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)

4
android/source/Makefile
View File

@@ -16,7 +16,7 @@ native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
$< -j -g core -g writer -g calc -g draw -g edit > $@ $< -j -g core -g writer -g calc -g draw -g edit > $@
install: 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
@echo 'Run it with "make run"' @echo 'Run it with "make run"'
@echo @echo
@@ -30,7 +30,7 @@ clean:
rm -f liboSettings.gradle rm -f liboSettings.gradle
build-gradle: liboSettings.gradle local.properties link-so 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: run:
$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(ANDROID_PACKAGE_NAME)/.ui.LibreOfficeUIActivity $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(ANDROID_PACKAGE_NAME)/.ui.LibreOfficeUIActivity

1
config_host.mk.in
View File

@@ -110,6 +110,7 @@ export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@
export DPKG=@DPKG@ export DPKG=@DPKG@
export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@ export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@
export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@ export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@
export ENABLE_ANDROID_EDITING=@ENABLE_ANDROID_EDITING@
export ENABLE_AVAHI=@ENABLE_AVAHI@ export ENABLE_AVAHI=@ENABLE_AVAHI@
export ENABLE_BREAKPAD=@ENABLE_BREAKPAD@ export ENABLE_BREAKPAD=@ENABLE_BREAKPAD@
export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@

10
configure.ac
View File

@@ -526,6 +526,16 @@ if test -n "$with_android_sdk"; then
fi fi
AC_SUBST(ANDROID_SDK_HOME) 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 ===================================================================
dnl The following is a list of supported systems. dnl The following is a list of supported systems.
dnl Sequential to keep the logic very simple dnl Sequential to keep the logic very simple