Update prefix to be 3rdParty\buildCache

This commit is contained in:
Tal Regev 2020-05-17 14:38:35 +03:00
parent 810153e2fd
commit 0dab68f881
2 changed files with 12 additions and 8 deletions

View File

@ -129,14 +129,14 @@ CURL_FLAGFILE="$PREFIX/curl-${CURL_VERSION}-${arch}_done"
OPENSSL_FLAGFILE="$PREFIX/openssl-${OPENSSL_VERSION}-${arch}_done"
if [ ! -e "${NDK_FLAGFILE}" ]; then
rm -rf "$HOME/android-ndk-r${NDK_VERSION}"
rm -rf "$BUILD_DIR/android-ndk-r${NDK_VERSION}"
rm -rf "${PREFIX}/${arch}"
rm -f "${CURL_FLAGFILE}" "${OPENSSL_FLAGFILE}"
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 $HOME
unzip -qq /tmp/ndk.zip -d $BUILD_DIR
touch "${NDK_FLAGFILE}"
fi
export NDK_ROOT=$HOME/android-ndk-r${NDK_VERSION}
export NDK_ROOT=$BUILD_DIR/android-ndk-r${NDK_VERSION}
if [ ! -e "${OPENSSL_FLAGFILE}" ]; then
rm -rf "$BUILD_DIR/openssl-${OPENSSL_VERSION}"

View File

@ -5,9 +5,13 @@ set -e
# See: https://boinc.berkeley.edu/trac/wiki/AndroidBuildClient
#
# Script to compile everything BOINC needs for Android
./buildAndroidBOINC-CI.sh --cache_dir "$ANDROID_TC" --build_dir "$HOME/3rdParty" --arch arm
./buildAndroidBOINC-CI.sh --cache_dir "$ANDROID_TC" --build_dir "$HOME/3rdParty" --arch arm64
./buildAndroidBOINC-CI.sh --cache_dir "$ANDROID_TC" --build_dir "$HOME/3rdParty" --arch x86
./buildAndroidBOINC-CI.sh --cache_dir "$ANDROID_TC" --build_dir "$HOME/3rdParty" --arch x86_64
# Script to compile everything BOINC needs for Android
cd ../
BUILD_DIR="$(pwd)/3rdParty/buildCache"
cd android/
./buildAndroidBOINC-CI.sh --cache_dir "$ANDROID_TC" --build_dir "$BUILD_DIR" --arch arm
./buildAndroidBOINC-CI.sh --cache_dir "$ANDROID_TC" --build_dir "$BUILD_DIR" --arch arm64
./buildAndroidBOINC-CI.sh --cache_dir "$ANDROID_TC" --build_dir "$BUILD_DIR" --arch x86
./buildAndroidBOINC-CI.sh --cache_dir "$ANDROID_TC" --build_dir "$BUILD_DIR" --arch x86_64