diff options
| author | Henry Castro <hcastro@collabora.com> | 2020-06-05 08:59:26 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2020-06-10 21:15:51 +0200 |
| commit | 4c36cad599add7cefa0af5ca983c81e5b085ffed (patch) | |
| tree | 8eb85633dc4ec098563e812f7bf52a313950f87a | |
| parent | android: Fix linking of liblo-native-code.so on x86_64 (diff) | |
| download | core-4c36cad599add7cefa0af5ca983c81e5b085ffed.tar.gz core-4c36cad599add7cefa0af5ca983c81e5b085ffed.zip | |
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>
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 4 |
1 files changed, 2 insertions, 2 deletions
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 ... |