[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - android/CustomTarget_lo_android.mk

[Jan Holesovsky (via logerrit)]

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

New commits:
commit 483e8d00dc0ad7753016a007e71a7412ac7fa952
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Jun 17 10:04:44 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jun 18 09:51:26 2019 +0200

    android: Fix non-debug build.
    
    Change-Id: If8bb944417da9a0aa6343d7dc87e7a1931689f1f
    Reviewed-on: https://gerrit.libreoffice.org/74147
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk
index 3f80fe86be3a..4badb659612e 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/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/debug/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin
+	cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/$(if $(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,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)