[Libreoffice-commits] core.git: android/CustomTarget_lo_android.mk

Christian Lohmaier lohmaier+LibreOffice at googlemail.com
Thu Jan 18 21:02:46 UTC 2018


 android/CustomTarget_lo_android.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a0f74a184f2057ebfca0d6f913a15d0a7542204b
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Jan 18 22:00:00 2018 +0100

    adjust path to generated apk to new defaults
    
    current android-gradle plugin creates the apk in dimension/flavor/variant
    (whatever you want to call it) specific directory
    
    Change-Id: I5514fe53c5c8c556d194a0f06ad6167b0b1cc98e

diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk
index 05d6d4353d9f..642dfe2f569a 100644
--- a/android/CustomTarget_lo_android.mk
+++ b/android/CustomTarget_lo_android.mk
@@ -20,7 +20,7 @@ $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNa
 # 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/source/build/outputs/apk/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin
+	cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI/debug/*-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)


More information about the Libreoffice-commits mailing list