summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorHenry Castro <hcastro@collabora.com>2020-06-05 08:59:26 -0400
committerMichael Meeks <michael.meeks@collabora.com>2020-06-19 14:26:23 +0100
commit398782041dde160cf31a69cd015340ad425b3514 (patch)
treedc034866c176d9a7320a33958f7e87e7e9f5f992 /android
parent6ab1c24b6c927cd00f482f50008b2048d3720fae (diff)
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 <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
Diffstat (limited to 'android')
-rw-r--r--android/Bootstrap/Makefile.shared4
1 files changed, 2 insertions, 2 deletions
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 ...