summaryrefslogtreecommitdiffstats
path: root/packaging/android
diff options
context:
space:
mode:
authorGravatar Jan Mulder <jlmulder@xs4all.nl>2018-11-24 10:21:07 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-01-22 13:02:39 +1300
commitc4aefc0d2911965acb2b245091ed8ba03f3382d8 (patch)
tree4ea6025ce93fcd8e072fbf5aa4ef5c8fb8582d18 /packaging/android
parenta2fb9fde0734e741bc3c915628d653e10a2788f3 (diff)
downloadsubsurface-c4aefc0d2911965acb2b245091ed8ba03f3382d8.tar.gz
Android build: always install libzip.a in lib directory
A subtle one. When compiling for arm64, libzip is the only package we use in mobile that installs its product in lib64. There is no reason for this given the way our build process is. So, simply force the library to reside in lib, independent if we are building arm or arm64 architectures. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Diffstat (limited to 'packaging/android')
-rwxr-xr-xpackaging/android/build.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index 9a41a041f..9a2d27ad1 100755
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -245,6 +245,7 @@ if [ "$QUICK" = "" ] ; then
-DCMAKE_C_COMPILER="$CC" \
-DCMAKE_LINKER="$CC" \
-DCMAKE_INSTALL_PREFIX="$PREFIX" \
+ -DCMAKE_INSTALL_LIBDIR="lib" \
-DBUILD_SHARED_LIBS=OFF \
../libzip/
make