diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-01-03 09:23:44 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-05-04 11:55:35 +0200 |
| commit | fa24ec47b7a54719b11481c6301f704fa3aec1f3 (patch) | |
| tree | f4ae0e8835415bd287ae68345288acf12e0bab19 /android | |
| parent | 5f181dd7625d86aeba7ef56519d7059218a61d34 (diff) | |
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/+/86170
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
(cherry picked from commit 3f5a4c8cf2e24f5da8319ff43d0b7da431ef6cc0)
Diffstat (limited to 'android')
| -rw-r--r-- | android/CustomTarget_lo_android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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) |