Kaydet (Commit) 3b9f9a5a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Don't bother building the DocumentLoader Android app every time

Change-Id: I90a96420c3261ce14f337dae3dfddfc01ac2436e
üst 8dc59410
......@@ -17,9 +17,9 @@ $(call gb_CustomTarget_get_target,android/desktop) : \
# in Module_android.mk, so lo4android_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 Desktop (this makefile),
# 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
# LibreOffice4Android 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
$(android_desktop_DIR)/done : $(lo4android_DIR)/done
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
......
# -*- 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/docloader))
docloader_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/DocumentLoader)
$(call gb_CustomTarget_get_target,android/docloader) : \
$(docloader_DIR)/done
# 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 serialize Ant access to Bootstrap, which is used both
# by DocumentLoader and sdremote. We don't want one Ant to be cleaning
# out Bootstrap while another is building stuff that depends on it.
# Yeah, this sucks
$(docloader_DIR)/done : $(sdremote_DIR)/done $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
cd $(SRCDIR)/android/experimental/DocumentLoader && $(MAKE) all
# If SRCDIR==BUILDDIR, copy to $(SRCDIR)/instsetoo_native/$(INPATH)/bin as that is where the tinderbox build script
# still looks for the .apk, and we want fresh daily builds to be uploaded.
if test $(SRCDIR) = $(BUILDDIR); then \
mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \
cp $(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \
fi
$(call gb_CustomTarget_get_clean_target,android/docloader) :
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
cd $(SRCDIR)/android/experimental/DocumentLoader && $(MAKE) clean
# vim: set noet sw=4 ts=4:
......@@ -13,15 +13,14 @@ lo4android_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/LibreO
$(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 (this
# makefile), 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
# 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 serialize Ant access to Bootstrap, which is used both
# by DocumentLoader and sdremote. We don't want one Ant to be cleaning
# out Bootstrap while another is building stuff that depends on it.
# Yeah, this sucks
$(lo4android_DIR)/done : $(docloader_DIR)/done
$(lo4android_DIR)/done : $(sdremote_DIR)/done $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) all
# If SRCDIR==BUILDDIR, copy to $(SRCDIR)/instsetoo_native/$(INPATH)/bin as that is where the tinderbox build script
......
......@@ -12,7 +12,6 @@ ifeq ($(OS),ANDROID)
$(eval $(call gb_Module_add_targets,android,\
CustomTarget_sdremote \
CustomTarget_docloader \
CustomTarget_lo4android \
CustomTarget_android_desktop \
))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment