46cb9a2982
Sure, it is not "clean" to write to $(SRCDIR)/instsetoo_native/$(INPATH)/bin,
but as long as the push_nightlies.sh script looks in instsetoo_native for
.apks, that is where they need to go.
This partially reverts commit b89ea45e5b
.
Change-Id: If1a0e50516f20c7571566a2cfa7e6a4b1dad30e4
38 lines
1.8 KiB
Makefile
38 lines
1.8 KiB
Makefile
# -*- 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/desktop))
|
|
|
|
android_desktop_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/Desktop)
|
|
|
|
$(call gb_CustomTarget_get_target,android/desktop) : \
|
|
$(android_desktop_DIR)/done
|
|
|
|
# We know that CustomTarget_lo4android.mk is included before this file
|
|
# 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
|
|
|
|
$(android_desktop_DIR)/done : $(lo4android_DIR)/done
|
|
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
|
|
cd $(SRCDIR)/android/experimental/desktop && $(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/desktop/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \
|
|
fi
|
|
|
|
$(call gb_CustomTarget_get_clean_target,android/desktop) :
|
|
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
|
|
cd $(SRCDIR)/android/experimental/desktop && $(MAKE) clean
|
|
|
|
# vim: set noet sw=4 ts=4:
|