Gitlab@AEI Hannover will go down for maintenance on 2020-09-21 at 4:00 UTC. The service will be unavailable for up to 24 hours. If you have questions about this please contact atlas_admin@aei.mpg.de

Commit 551c40ca authored by talregev's avatar talregev

Define default ANDROID_TC in build_all.sh and travis_build_all.sh

and use ANDROID_TC for the neon test.
parent 10554a2c
......@@ -17,7 +17,9 @@ cd android/
./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
if [ ! -d ../3rdParty/buildCache/android-tc/arm ]; then
ANDROID_TC="${ANDROID_TC:-../3rdParty/buildCache/android-tc/arm}"
if [ ! -d $ANDROID_TC ]; then
echo You run this script from diffrent folder: $PWD
echo Please run it from boinc/android
exit 1
......@@ -26,7 +28,7 @@ fi
list_libs="libcrypto.a libssl.a libcurl.a"
for i in $list_libs; do
if [ $(readelf -A $(find ../3rdParty/buildCache/android-tc/arm -name "$i") | grep -i neon | head -c1 | wc -c) -ne 0 ]; then
if [ $(readelf -A $(find $ANDROID_TC -name "$i") | grep -i neon | head -c1 | wc -c) -ne 0 ]; then
echo "$i" is with neon optimization
exit 1
fi
......
......@@ -12,7 +12,9 @@ set -e
./buildAndroidBOINC-CI.sh --cache_dir "$ANDROID_TC" --build_dir "$BUILD_DIR" --silent --ci --arch x86
./buildAndroidBOINC-CI.sh --cache_dir "$ANDROID_TC" --build_dir "$BUILD_DIR" --silent --ci --arch x86_64
if [ ! -d ../3rdParty/buildCache/android-tc/arm ]; then
ANDROID_TC="${ANDROID_TC:-../3rdParty/buildCache/android-tc/arm}"
if [ ! -d $ANDROID_TC ]; then
echo You run this script from diffrent folder: $PWD
echo Please run it from boinc/android
exit 1
......@@ -21,7 +23,7 @@ fi
list_libs="libcrypto.a libssl.a libcurl.a"
for i in $list_libs; do
if [ $(readelf -A $(find ../3rdParty/buildCache/android-tc/arm -name "$i") | grep -i neon | head -c1 | wc -c) -ne 0 ]; then
if [ $(readelf -A $(find $ANDROID_TC -name "$i") | grep -i neon | head -c1 | wc -c) -ne 0 ]; then
echo "$i" is with neon optimization
exit 1
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment