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

If the NDK_FLAGFILE is not present, compile also opensll and curl with the new ndk. 

Add 3rdParty/android/ to git ignore.
This commit is contained in:
talregev 2020-07-03 18:24:54 +03:00
parent 2294655d0b
commit 40c57eb794
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -129,6 +129,7 @@ locale/*/*.flag
3rdParty/linux/ 3rdParty/linux/
3rdParty/mac/ 3rdParty/mac/
3rdParty/buildCache/ 3rdParty/buildCache/
3rdParty/android/
.libs/ .libs/
svn_version.h svn_version.h

18
android/buildAndroidBOINC-CI.sh
View File

@ -134,29 +134,21 @@ fi
export COMPILEOPENSSL="no" export COMPILEOPENSSL="no"
export COMPILECURL="no" export COMPILECURL="no"
export NDK_FLAGFILE="$PREFIX/NDK-${NDK_VERSION}_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 CREATE_NDK_FOLDER=${CREATE_NDK_FOLDER:-"no"}
createNDKFolder() if [ ! -e "${NDK_FLAGFILE}" ]; then
{ rm -rf $OPENSSL_FLAGFILE
rm -rf $CURL_FLAGFILE
if [ $CREATE_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.zip -d $BUILD_DIR unzip -qq /tmp/ndk_${NDK_VERSION}.zip -d $BUILD_DIR
export CREATE_NDK_FOLDER="yes" export CREATE_NDK_FOLDER="yes"
fi fi
}
if [ ci = "yes" ]; then
createNDKFolder
else
if [ ! -e "${NDK_FLAGFILE}" ]; then
export CREATE_NDK_FOLDER="no"
createNDKFolder
touch "${NDK_FLAGFILE}" touch "${NDK_FLAGFILE}"
fi
fi fi
export NDK_ROOT=$BUILD_DIR/android-ndk-r${NDK_VERSION} export NDK_ROOT=$BUILD_DIR/android-ndk-r${NDK_VERSION}