diff --git a/android/buildAndroidBOINC-CI.sh b/android/buildAndroidBOINC-CI.sh
index 658e995229..0ab04af5b4 100755
--- a/android/buildAndroidBOINC-CI.sh
+++ b/android/buildAndroidBOINC-CI.sh
@@ -190,11 +190,24 @@ export ANDROID_TC=$PREFIX
 
 export VERBOSE=$verbose
 
+NeonTest()
+{
+    list_libs="libcrypto.a libssl.a libcurl.a"
+
+    for i in $list_libs; do
+        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
+    done
+}
+
 case "$arch" in
     "arm")
         ./build_openssl_arm.sh
         ./build_curl_arm.sh
         ./build_boinc_arm.sh
+        NeonTest
         exit 0
     ;;
     "arm64")
diff --git a/android/build_all.sh b/android/build_all.sh
index cafbf0188d..130cbe2cf9 100755
--- a/android/build_all.sh
+++ b/android/build_all.sh
@@ -17,21 +17,4 @@ 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
 
-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
-fi
-
-list_libs="libcrypto.a libssl.a libcurl.a"
-
-for i in $list_libs; do
-    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
-done
-
 echo '===== BOINC for all platforms build done ====='
diff --git a/android/travis_build_all.sh b/android/travis_build_all.sh
index edbcdacb5e..37c78e5c40 100755
--- a/android/travis_build_all.sh
+++ b/android/travis_build_all.sh
@@ -12,21 +12,4 @@ 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
 
-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
-fi
-
-list_libs="libcrypto.a libssl.a libcurl.a"
-
-for i in $list_libs; do
-    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
-done
-
 echo '===== BOINC for all platforms build done ====='