diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index eb3812f1b9fb..1b158439f351 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -14,7 +14,8 @@ # configurability on platforms like Android and iOS where apps based on LO # code are very much self-contained pre-packaged thingies. -SODEST=$(BUILDDIR)/android/jniLibs/$(ANDROID_APP_ABI) +JNILIBSDIR=$(BUILDDIR)/android/jniLibs +SODEST=$(JNILIBSDIR)/$(ANDROID_APP_ABI) OBJLOCAL=$(BUILDDIR)/android/obj/local/$(ANDROID_APP_ABI) # @@ -90,6 +91,7 @@ liboSettings.gradle: $(BUILDDIR)/config_build.mk $(BUILDDIR)/config_host.mk echo "// created by Makefile.shared - your changes will be overridden" \ && echo "ext {" \ && echo " liboSrcRoot = '$(SRC_ROOT)'" \ + && echo " liboJniLibsdir = '$(JNILIBSDIR)'" \ && echo " liboWorkdir = '$(WORKDIR)'" \ && echo " liboInstdir = '$(INSTDIR)'" \ && echo " liboEtcFolder = '$(LIBO_ETC_FOLDER)'" \ diff --git a/android/source/build.gradle b/android/source/build.gradle index 371d39d547f2..fb155b693f4c 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -48,7 +48,7 @@ android { main.assets.srcDirs = ['assets'] main.res.srcDirs = ['res'] main.java.srcDirs = ['../Bootstrap/src', 'src/java'] - main.jniLibs.srcDirs = ['jniLibs'] + main.jniLibs.srcDirs = ["${liboJniLibsdir}"] main.jni.srcDirs = [] // don't attempt to build native-lib via gradle // the configuration data that might be stripped or not fullUI.assets.srcDirs 'assets_fullUI'