strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make it possible to just build the native code for Android, no Java bits

Browse source 
Change-Id: Ic25b8d72c9e60c0bee04765d51565c2864ec25ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95850
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
This commit is contained in:
Tor Lillqvist 2020-04-24 17:09:01 +03:00 committed by Tor Lillqvist
parent ab267a5282
commit 04ca42f87b
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/CustomTarget_lo_android.mk
View file

@ -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)

2
android/source/Makefile
View file

@ -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