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

Build also LibreOffice4Android

Browse Source 
Change-Id: I81f241d830bc914c7ddf3cce23fb6bb48f30e89b
This commit is contained in:
Tor Lillqvist
2012-09-10 14:04:19 +03:00
committed by Tor Lillqvist
parent cea414bfe8
commit 1260555e28
3 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/CustomTarget_docloader.mk
View File

@@ -15,9 +15,9 @@ $(call gb_CustomTarget_get_target,android/docloader) : \
# We know that CustomTarget_sdremote.mk is included first, so sdremote_DIR is # We know that CustomTarget_sdremote.mk is included first, so sdremote_DIR is
# defined. We want that to be built completely first, so that we can # defined. We want that to be built completely first, so that we can
# serialize Ant access to abs-lib, which is used both by DocumentLoader and # serialize Ant access to Bootstrap, which is used both by DocumentLoader and
# sdremote. We don't want one Ant to be cleaning out abs-lib while another is # sdremote. We don't want one Ant to be cleaning out Bootstrap while another
# building stuff that depends on it. Yeah, this sucks # is building stuff that depends on it. Yeah, this sucks
$(docloader_DIR)/done : $(sdremote_DIR)/done $(docloader_DIR)/done : $(sdremote_DIR)/done
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1)

29
android/CustomTarget_lo4android.mk Normal file
View File

@@ -0,0 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
$(eval $(call gb_CustomTarget_CustomTarget,android/lo4android))
lo4android_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/LibreOffice4Android)
$(call gb_CustomTarget_get_target,android/lo4android) : \
$(lo4android_DIR)/done
# We know that CustomTarget_docloader.mk is included before this file in
# Module_android-mk, so docloader_DIR is defined. We want that to be built
# completely first, so that we can serialize Ant access to Bootstrap and
# abs-lib, which are used by LibreOffice4Android, DocumentLoader and
# sdremote. We don't want one Ant to be cleaning out one place while another
# is building stuff that depends on it. Yeah, this sucks
$(lo4android_DIR)/done : $(docloader_DIR)/done
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1)
cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) clean && $(MAKE) all
mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
cp $(SRCDIR)/android/experimental/LibreOffice4Android/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
# vim: set noet sw=4 ts=4:

1
android/Module_android.mk
View File

@@ -13,6 +13,7 @@ ifeq ($(OS),ANDROID)
$(eval $(call gb_Module_add_targets,android,\ $(eval $(call gb_Module_add_targets,android,\
CustomTarget_sdremote \ CustomTarget_sdremote \
CustomTarget_docloader \ CustomTarget_docloader \
CustomTarget_lo4android \
)) ))
endif endif