[Libreoffice-commits] core.git: android/CustomTarget_lo_android.mk android/source

[Tor Lillqvist (via logerrit)]

 android/CustomTarget_lo_android.mk |    2 ++
 android/source/Makefile            |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 04ca42f87b7c59224fafd35bf220c974300566e4
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Fri Apr 24 17:09:01 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Jun 11 06:48:01 2020 +0200

    Make it possible to just build the native code for Android, no Java bits
    
    Change-Id: Ic25b8d72c9e60c0bee04765d51565c2864ec25ea
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95850
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk
index c735139fa06e..93a434d11d16 100644
--- a/android/CustomTarget_lo_android.mk
+++ b/android/CustomTarget_lo_android.mk
@@ -17,12 +17,14 @@ $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNa
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
 	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MAK)
 	cd $(SRCDIR)/android/source && $(MAKE) all
+ifeq ($(ENABLE_JAVA),TRUE)
 # Copy to $(BUILDDIR)/instsetoo_native as that is where the tinderbox build script
 # 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; \
 	if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/$(if $(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,debug/*-debug.apk) $(BUILDDIR)/instsetoo_native/foo/bin ; fi
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),MAK)
+endif
 
 $(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 b64802ec9e78..1d9ca02d3556 100644
--- a/android/source/Makefile
+++ b/android/source/Makefile
@@ -28,7 +28,9 @@ clean:
 	rm -f liboSettings.gradle
 
 build-gradle: liboSettings.gradle local.properties link-so
+ifeq ($(ENABLE_JAVA),TRUE)
 	if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then ./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) ; fi
+endif
 
 run:
 	if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(ANDROID_PACKAGE_NAME)/.ui.LibreOfficeUIActivity ; fi