From 0dffc65236fbacf98047d6dbfc82b4efe7dd959b Mon Sep 17 00:00:00 2001 From: Henry Castro Date: Fri, 5 Jun 2020 08:59:26 -0400 Subject: 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 Reviewed-by: Henry Castro Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98290 Tested-by: Jenkins --- android/Bootstrap/Makefile.shared | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'android') diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 3e38e14617cc..eb3812f1b9fb 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 ... -- cgit