Android build: build openssl before libzip

On very clean builds not using the wrapper script, the compile of libzip
simply fails because it depend on openssl include files. Simply swap them
around.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>

packaging/android/build.sh

@@ -235,28 +235,6 @@ if [ "$QUICK" = "" ] ; then
 		popd
 	fi
 	
-	"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libzip
-	if [ ! -e "$PKG_CONFIG_LIBDIR/libzip.pc" ] ; then
-		# libzip expects a predefined macro that isn't there for our compiler
-		pushd libzip
-		git reset --hard
-		sed -i 's/SIZEOF_SIZE_T/__SIZEOF_SIZE_T__/g' lib/compat.h
-		# also, don't deal with manuals and bzip2
-		sed -i 's/ADD_SUBDIRECTORY(man)//;s/FIND_PACKAGE(BZip2)/# FIND_PACKAGE(BZip2)/' CMakeLists.txt
-		popd
-		mkdir -p libzip-build-"$ARCH"
-		pushd libzip-build-"$ARCH"
-		cmake \
-			-DCMAKE_C_COMPILER="$CC" \
-			-DCMAKE_LINKER="$CC" \
-			-DCMAKE_INSTALL_PREFIX="$PREFIX" \
-			-DCMAKE_INSTALL_LIBDIR="lib" \
-			-DBUILD_SHARED_LIBS=OFF \
-			../libzip/
-		make
-		make install
-		popd
-	fi
 
 	"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . openssl
 	if [ ! -e "$PKG_CONFIG_LIBDIR/libssl.pc" ] ; then
@@ -282,6 +260,29 @@ if [ "$QUICK" = "" ] ; then
 		popd
 	fi
 
+"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libzip
+	if [ ! -e "$PKG_CONFIG_LIBDIR/libzip.pc" ] ; then
+		# libzip expects a predefined macro that isn't there for our compiler
+		pushd libzip
+		git reset --hard
+		sed -i 's/SIZEOF_SIZE_T/__SIZEOF_SIZE_T__/g' lib/compat.h
+		# also, don't deal with manuals and bzip2
+		sed -i 's/ADD_SUBDIRECTORY(man)//;s/FIND_PACKAGE(BZip2)/# FIND_PACKAGE(BZip2)/' CMakeLists.txt
+		popd
+		mkdir -p libzip-build-"$ARCH"
+		pushd libzip-build-"$ARCH"
+		cmake \
+			-DCMAKE_C_COMPILER="$CC" \
+			-DCMAKE_LINKER="$CC" \
+			-DCMAKE_INSTALL_PREFIX="$PREFIX" \
+			-DCMAKE_INSTALL_LIBDIR="lib" \
+			-DBUILD_SHARED_LIBS=OFF \
+			../libzip/
+		make
+		make install
+		popd
+	fi
+
 	"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libgit2
 	if [ ! -e "$PKG_CONFIG_LIBDIR/libgit2.pc" ] ; then
 		# We don't want to find the HTTP_Parser package of the build host by mistake