From 13f108c9dd024ac1b12f84cda7362344caada8dd Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Sat, 24 Nov 2018 10:29:39 +0100 Subject: Android build: openssl, do not move source tree Very annoyingly, openssl is re-build and downloaded numerous times when doing partial builds. Reason for this, is that the original checked out git repo is moved away, and build in source (as openssl does ...). So, this simple change leaves the checked out repo in place, and copies the tree to build in. Signed-off-by: Jan Mulder --- packaging/android/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 9a2d27ad1..cd869941e 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -254,10 +254,9 @@ if [ "$QUICK" = "" ] ; then fi "${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . openssl - if [ ! -e openssl-build-"$ARCH" ] ; then - mv openssl openssl-build-"$ARCH" - fi if [ ! -e "$PKG_CONFIG_LIBDIR/libssl.pc" ] ; then + mkdir -p openssl-build-"$ARCH" + cp -r openssl/* openssl-build-"$ARCH" pushd openssl-build-"$ARCH" perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org # Use env to make all these temporary, so they don't pollute later builds. -- cgit v1.2.3-70-g09d2