android/CustomTarget_lo_android.mk | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
New commits: commit bfceafa67ed1cc3e4e03f8f214a2716f57b2d1e7 Author: Tor Lillqvist <[email protected]> Date: Sun Feb 1 13:43:55 2015 +0100 Bin obsolete comments diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk index 4d32cac..24225c0 100644 --- a/android/CustomTarget_lo_android.mk +++ b/android/CustomTarget_lo_android.mk @@ -13,18 +13,11 @@ loandroid3_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/LOAndr $(call gb_CustomTarget_get_target,android/loandroid3) : \ $(loandroid3_DIR)/done -# We want that to be built completely first, -# so that we can serialize Ant access to Bootstrap, which is used both -# by DocumentLoader. We don't want one Ant to be cleaning -# out Bootstrap while another is building stuff that depends on it. -# Yeah, this sucks - $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) cd $(SRCDIR)/android/experimental/LOAndroid3 && $(MAKE) all # 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. Even if -# the apps as such are mostly useless. +# 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; \ cp $(SRCDIR)/android/experimental/LOAndroid3/bin/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin commit 1895fd2195ab11026e07271dbba71c0e963c0a3b Author: Tor Lillqvist <[email protected]> Date: Sun Feb 1 13:41:48 2015 +0100 Copy only *-debug.apk We don't want the silly 'unaligned' apk to end up being uploaded. diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk index 5ee53d4..4d32cac 100644 --- a/android/CustomTarget_lo_android.mk +++ b/android/CustomTarget_lo_android.mk @@ -27,7 +27,7 @@ $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNa # the apps as such are mostly useless. # Us "foo" instead of the old INPATH mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \ - cp $(SRCDIR)/android/experimental/LOAndroid3/bin/*.apk $(BUILDDIR)/instsetoo_native/foo/bin + cp $(SRCDIR)/android/experimental/LOAndroid3/bin/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin $(call gb_CustomTarget_get_clean_target,android/loandroid3) : $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
