Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Fix createNDKFolder for CI

This commit is contained in:
talregev 2020-07-03 18:40:14 +03:00
parent 40c57eb794
commit c875cda399
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
android/buildAndroidBOINC-CI.sh
View File

@ -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"}
if [ ! -e "${NDK_FLAGFILE}" ]; then createNDKFolder()
rm -rf $OPENSSL_FLAGFILE {
rm -rf $CURL_FLAGFILE if [ $CREATED_NDK_FOLDER = "no" ]; then
if [ $CREATE_NDK_FOLDER = "no" ]; then
rm -rf "$BUILD_DIR/android-ndk-r${NDK_VERSION}" 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 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_${NDK_VERSION}.zip -d $BUILD_DIR unzip -qq /tmp/ndk.zip -d $BUILD_DIR
export CREATE_NDK_FOLDER="yes" export CREATED_NDK_FOLDER="yes"
touch "${NDK_FLAGFILE}"
fi
}
if [ ci = "yes" ]; then
if [ ! -e "${NDK_FLAGFILE}" ]; then
rm -rf $OPENSSL_FLAGFILE
rm -rf $CURL_FLAGFILE
export CREATED_NDK_FOLDER="no"
fi
createNDKFolder
else
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}