android/Bootstrap/Makefile.shared | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 4c36cad599add7cefa0af5ca983c81e5b085ffed Author: Henry Castro <hcas...@collabora.com> AuthorDate: Fri Jun 5 08:59:26 2020 -0400 Commit: Henry Castro <hcas...@collabora.com> CommitDate: Wed Jun 10 21:15:51 2020 +0200 android: fix the build output directory When compiling in a different build output directory, the "liblo-native-code.so" file is created in the source directory and it fails compiling the "online" project Change-Id: I4782a69796fb298e9c1a6c4370720b18587735e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95602 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Henry Castro <hcas...@collabora.com> diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 0d7f2581ee3d..e03f4999d477 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -14,8 +14,8 @@ # configurability on platforms like Android and iOS where apps based on LO # code are very much self-contained pre-packaged thingies. -SODEST=jniLibs/$(ANDROID_APP_ABI) -OBJLOCAL=obj/local/$(ANDROID_APP_ABI) +SODEST=$(BUILDDIR)/android/jniLibs/$(ANDROID_APP_ABI) +OBJLOCAL=$(BUILDDIR)/android/obj/local/$(ANDROID_APP_ABI) # # Helpful rules ... _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits