diff --git a/android/build_all.sh b/android/build_all.sh index a345cf99dc..73b738658f 100644 --- a/android/build_all.sh +++ b/android/build_all.sh @@ -5,3 +5,4 @@ ./build_openssl.sh ./build_curl.sh ./build_boinc.sh +./copy_assets.sh diff --git a/android/build_androidtc.sh b/android/build_androidtc.sh index b9ab7ca940..4dbdd6c530 100644 --- a/android/build_androidtc.sh +++ b/android/build_androidtc.sh @@ -2,15 +2,6 @@ #script to setup Android toolchain export ANDROIDTC="~/android-tc" -export TCBINARIES="$ANDROIDTC/bin" -export TCINCLUDES="$ANDROIDTC/arm-linux-androideabi" -export TCSYSROOT="$ANDROIDTC/sysroot" -export STDCPPTC="$TCINCLUDES/lib/libstdc++.a" - -export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin" -export CC=arm-linux-androideabi-gcc -export CXX=arm-linux-androideabi-g++ -export LD=arm-linux-androideabi-ld if [ ! -d "$ANDROIDTC" ]; then diff --git a/android/build_boinc.sh b/android/build_boinc.sh index 7a0f962253..89b22fd2b5 100644 --- a/android/build_boinc.sh +++ b/android/build_boinc.sh @@ -10,6 +10,16 @@ export OPENSSL_DIR=$BOINC/../boinc_depends_android_eclipse/openssl export CURL_DIR=$BOINC/../boinc_depends_android_eclipse/curl export PKG_CONFIG_DEBUG_SPEW=1 +export ANDROIDTC="~/android-tc" +export TCBINARIES="$ANDROIDTC/bin" +export TCINCLUDES="$ANDROIDTC/arm-linux-androideabi" +export TCSYSROOT="$ANDROIDTC/sysroot" +export STDCPPTC="$TCINCLUDES/lib/libstdc++.a" + +export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin" +export CC=arm-linux-androideabi-gcc +export CXX=arm-linux-androideabi-g++ +export LD=arm-linux-androideabi-ld export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer" export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer" export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog" diff --git a/android/build_curl.sh b/android/build_curl.sh index 2018a88716..f1be897013 100644 --- a/android/build_curl.sh +++ b/android/build_curl.sh @@ -7,6 +7,16 @@ MAKECLEAN="yes" CURL="/home/boincadm/src/curl-7.28.1" #CURL sources, required by BOINC +export ANDROIDTC="~/android-tc" +export TCBINARIES="$ANDROIDTC/bin" +export TCINCLUDES="$ANDROIDTC/arm-linux-androideabi" +export TCSYSROOT="$ANDROIDTC/sysroot" +export STDCPPTC="$TCINCLUDES/lib/libstdc++.a" + +export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin" +export CC=arm-linux-androideabi-gcc +export CXX=arm-linux-androideabi-g++ +export LD=arm-linux-androideabi-ld export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer" export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer" export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog" diff --git a/android/build_openssl.sh b/android/build_openssl.sh index 89fcf6e838..9bcbed8303 100644 --- a/android/build_openssl.sh +++ b/android/build_openssl.sh @@ -7,6 +7,16 @@ MAKECLEAN="yes" OPENSSL="/home/boincadm/src/openssl-1.0.1c" #openSSL sources, requiered by BOINC +export ANDROIDTC="~/android-tc" +export TCBINARIES="$ANDROIDTC/bin" +export TCINCLUDES="$ANDROIDTC/arm-linux-androideabi" +export TCSYSROOT="$ANDROIDTC/sysroot" +export STDCPPTC="$TCINCLUDES/lib/libstdc++.a" + +export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin" +export CC=arm-linux-androideabi-gcc +export CXX=arm-linux-androideabi-g++ +export LD=arm-linux-androideabi-ld export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer" export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer" export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"