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

[Miklos Vajna (via logerrit)]

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

New commits:
commit ceec2dbcb3f429672a6360e4e71685e58b20640c
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Jan 3 09:23:44 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Jan 3 11:50:44 2020 +0100

    android: don't try to copy the apk if it does not exist
    
    Linking obj/local/armeabi-v7a/liblo-native-code.so
    cp: cannot stat 'android/source/build/outputs/apk/strippedUI/release/*-release-unsigned.apk': No such file or directory
    make[1]: *** [android/CustomTarget_lo_android.mk:19: workdir/CustomTarget/android/source/done] Error 1
    
    Change-Id: I90818d432cab0ef8ef7049b6be175db9e9028261
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86157
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk
index 4badb659612e..b64c9245aeff 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)/$(if $(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,debug/*-debug.apk) $(BUILDDIR)/instsetoo_native/foo/bin
+	if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then 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 ; fi
 
 $(call gb_CustomTarget_get_clean_target,android/loandroid3) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)