mirror of https://github.com/BOINC/boinc.git
Fix createNDKFolder for CI
This commit is contained in:
parent
40c57eb794
commit
c875cda399
|
@ -137,18 +137,33 @@ export COMPILECURL="no"
|
||||||
export NDK_FLAGFILE="$PREFIX/NDK-${NDK_VERSION}-${arch}_done"
|
export NDK_FLAGFILE="$PREFIX/NDK-${NDK_VERSION}-${arch}_done"
|
||||||
export CURL_FLAGFILE="$PREFIX/curl-${CURL_VERSION}-${arch}_done"
|
export CURL_FLAGFILE="$PREFIX/curl-${CURL_VERSION}-${arch}_done"
|
||||||
export OPENSSL_FLAGFILE="$PREFIX/openssl-${OPENSSL_VERSION}-${arch}_done"
|
export OPENSSL_FLAGFILE="$PREFIX/openssl-${OPENSSL_VERSION}-${arch}_done"
|
||||||
export CREATE_NDK_FOLDER=${CREATE_NDK_FOLDER:-"no"}
|
export CREATED_NDK_FOLDER=${CREATED_NDK_FOLDER:-"no"}
|
||||||
|
|
||||||
|
createNDKFolder()
|
||||||
|
{
|
||||||
|
if [ $CREATED_NDK_FOLDER = "no" ]; then
|
||||||
|
rm -rf "$BUILD_DIR/android-ndk-r${NDK_VERSION}"
|
||||||
|
wget -c --no-verbose -O /tmp/ndk.zip https://dl.google.com/android/repository/android-ndk-r${NDK_VERSION}-linux-x86_64.zip
|
||||||
|
unzip -qq /tmp/ndk.zip -d $BUILD_DIR
|
||||||
|
export CREATED_NDK_FOLDER="yes"
|
||||||
|
touch "${NDK_FLAGFILE}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ ci = "yes" ]; then
|
||||||
if [ ! -e "${NDK_FLAGFILE}" ]; then
|
if [ ! -e "${NDK_FLAGFILE}" ]; then
|
||||||
rm -rf $OPENSSL_FLAGFILE
|
rm -rf $OPENSSL_FLAGFILE
|
||||||
rm -rf $CURL_FLAGFILE
|
rm -rf $CURL_FLAGFILE
|
||||||
if [ $CREATE_NDK_FOLDER = "no" ]; then
|
export CREATED_NDK_FOLDER="no"
|
||||||
rm -rf "$BUILD_DIR/android-ndk-r${NDK_VERSION}"
|
fi
|
||||||
wget -c --no-verbose -O /tmp/ndk.zip https://dl.google.com/android/repository/android-ndk-r${NDK_VERSION}-linux-x86_64.zip
|
createNDKFolder
|
||||||
unzip -qq /tmp/ndk_${NDK_VERSION}.zip -d $BUILD_DIR
|
else
|
||||||
export CREATE_NDK_FOLDER="yes"
|
if [ ! -e "${NDK_FLAGFILE}" ]; then
|
||||||
|
rm -rf $OPENSSL_FLAGFILE
|
||||||
|
rm -rf $CURL_FLAGFILE
|
||||||
|
export CREATED_NDK_FOLDER="no"
|
||||||
|
createNDKFolder
|
||||||
fi
|
fi
|
||||||
touch "${NDK_FLAGFILE}"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export NDK_ROOT=$BUILD_DIR/android-ndk-r${NDK_VERSION}
|
export NDK_ROOT=$BUILD_DIR/android-ndk-r${NDK_VERSION}
|
||||||
|
|
Loading…
Reference in New Issue