Updated OpenSSL tag to 1.0.1h-fips-2.0.7

Using ndk-build from ANDROID_NDK now if available, fallback to path.
This commit is contained in:
Armin Novak 2014-07-08 12:44:35 +02:00
parent 4b901aa3a9
commit 80e6a055fb

View File

@ -12,11 +12,19 @@
# android_setup_build_env.sh <source root>
OPENSSL_SCM=https://github.com/akallabeth/openssl-android.git
OPENSSL_TAG=1.0.1h
OPENSSL_TAG=1.0.1h-fips-2.0.7
NDK_PROFILER_SCM=https://github.com/richq/android-ndk-profiler.git
JPEG_LIBRARY_SCM=https://github.com/akallabeth/jpeg8d.git
SCRIPT_NAME=`basename $0`
SCRIPT_NAME=$(basename $0)
if [ -x $ANDROID_NDK/ndk-build ]; then
NDK_BUILD=$ANDROID_NDK/ndk-build
else
echo "ndk-build not found in NDK directory $ANDROID_NDK"
echo "assuming ndk-build is in path..."
NDK_BUILD=ndk-build
fi
if [ $# -ne 1 ]; then
@ -91,11 +99,11 @@ if [ $RETVAL -ne 0 ]; then
exit -5
fi
cd $NDK_PROFILER_SRC
ndk-build V=1 APP_ABI=armeabi-v7a clean
ndk-build V=1 APP_ABI=armeabi-v7a
$NDK_BUILD V=1 APP_ABI=armeabi-v7a clean
$NDK_BUILD V=1 APP_ABI=armeabi-v7a
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
echo "Failed to execute ndk-build command [$RETVAL]"
echo "Failed to execute $NDK_BUILD command [$RETVAL]"
exit -6
fi
@ -114,11 +122,11 @@ if [ $RETVAL -ne 0 ]; then
exit -6
fi
cd $JPEG_LIBRARY_SRC
ndk-build V=1 APP_ABI=armeabi-v7a clean
ndk-build V=1 APP_ABI=armeabi-v7a
$NDK_BUILD V=1 APP_ABI=armeabi-v7a clean
$NDK_BUILD V=1 APP_ABI=armeabi-v7a
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
echo "Failed to execute ndk-build command [$RETVAL]"
echo "Failed to execute $NDK_BUILD command [$RETVAL]"
exit -7
fi
mkdir -p $JPEG_LIBRARY_SRC/lib