From bc6c034ba0bc163bfd6f437582ee3dbdcffbe81f Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Fri, 17 Jul 2020 09:25:11 +0200 Subject: tdf#134846 Android Viewer: Include native libs again commit 0dffc65236fbacf98047d6dbfc82b4efe7dd959b Date: Fri Jun 5 08:59:26 2020 -0400 android: fix the build output directory submitted on 2020-07-07 had changed the output directory for native libraries, so the directory used by Android Viewer was empty, and native libs no longer contained in the package/APK. Store the actual/new directory in a variable and use that one in build.gradle to make things work again. Change-Id: I5a051342278ab14e71edf47dd93e8dacdb9f3cb6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98970 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- android/Bootstrap/Makefile.shared | 4 +++- android/source/build.gradle | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'android') 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' -- cgit