X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=356e8083a36ea5c3d1e9ecf6f743f0964f7e1213;hp=ffd61d32f90c1b0d6943dfef04dc5b821af0f699;hb=b1181fe12749e653f74285f71edd09dd6fc859ff;hpb=38370bb499f397aa5dfa7a0fd8b7df06558768fa

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index ffd61d3..356e808 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -31,17 +31,12 @@ ANDROID_NDK=$ANDROID_PATH/android-ndk-r10e
 ANDROID_SDK=$ANDROID_PATH/android-sdk-linux
 
 # The path where your Android toolchain directory is located.
-# TOOLCHAIN=$ANDROID_PATH/android-arm-toolchain
-# TOOLCHAIN=$ANDROID_PATH/android-mipsel-toolchain
-# TOOLCHAIN=$ANDROID_PATH/android-i686-toolchain
 TOOLCHAIN=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86
 # TOOLCHAIN=$ANDROID_NDK/toolchains/x86-4.9/prebuilt/linux-x86
-# TOOLCHAIN=$ANDROID_NDK/toolchains/mipsel-linux-android-4.9/prebuilt/linux-x86
 
 # Select which Android toolchain to use.
 # Don't forget to also adapt TOOLCHAIN above if you change TOOLCHAIN_TRIPLET!
 TOOLCHAIN_TRIPLET=arm-linux-androideabi
-# TOOLCHAIN_TRIPLET=mipsel-linux-android
 # TOOLCHAIN_TRIPLET=i686-linux-android
 
 # The path where the cross-compiled packages will be installed.
@@ -78,7 +73,7 @@ VER_PYTHON=3.3.3
 VER_BOOST=1.58.0
 VER_QT=5.6.0
 VER_QT_SHORT=5.6
-VER_SIGROK_FIRMWARE_FX2LAFW=0.1.3
+VER_SIGROK_FIRMWARE_FX2LAFW=0.1.6
 VER_NDK=10e
 VER_SDK=24.4.1
 VER_AND_BT=23.0.2 # Android build tools version
@@ -93,7 +88,6 @@ REPO_BASE="git://sigrok.org"
 
 case "$TOOLCHAIN_TRIPLET" in
   arm*) TARGET_ARCH=armeabi;;
-  mips*) TARGET_ARCH=mips;;
   i686*) TARGET_ARCH=x86;;
   *) echo >&2 "Unknown prefix for TOOLCHAIN_TRIPLET."; exit 1;;
 esac
@@ -116,9 +110,6 @@ if [ "x$1" = "xprepare" ]; then
   ./build/tools/make-standalone-toolchain.sh --platform=android-$VER_AND_API \
     --toolchain=x86-4.9 \
     --install-dir=$ANDROID_PATH/android-i686-toolchain
-  ./build/tools/make-standalone-toolchain.sh --platform=android-$VER_AND_API \
-    --toolchain=mipsel-linux-android-4.9 \
-    --install-dir=$ANDROID_PATH/android-mipsel-toolchain
   cd ..
 
   # SDK
@@ -191,6 +182,7 @@ else
   CM="$CM -DANDROID_NDK=${ANDROID_NDK}"
   CM="$CM -DANDROID_NATIVE_API_LEVEL=${NATIVE_API_LEVEL}"
   CM="$CM -DANDROID_TOOLCHAIN_NAME=${TOOLCHAIN_TRIPLET}-${NDK_TOOLCHAIN_VERSION}"
+  CM="$CM -DCMAKE_MAKE_PROGRAM=${ANDROID_NDK}/prebuilt/linux-x86/bin/make"
 fi
 
 # Look for STL, needed to build bindings
@@ -449,7 +441,7 @@ echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : <cxxfl
 cd ..
 
 # Qt (needed for PulseView)
-$WGET http://download.qt.io/official_releases/qt/${VER_QT_SHORT}/${VER_QT}/single/qt-everywhere-opensource-src-${VER_QT}.tar.xz
+$WGET https://download.qt.io/new_archive/qt/${VER_QT_SHORT}/${VER_QT}/single/qt-everywhere-opensource-src-${VER_QT}.tar.xz
 tar xfi qt-everywhere-opensource-src-${VER_QT}.tar.xz
 cd qt-everywhere-opensource-src-${VER_QT}
 patch -p1 < ../../android-qt.patch
@@ -465,21 +457,18 @@ CC= CXX= ./configure \
 	-android-arch "$TARGET_ARCH" \
 	-android-toolchain-version "$NDK_TOOLCHAIN_VERSION" \
 	-skip qtconnectivity \
-	-skip qtdeclarative \
 	-skip qtlocation \
 	-skip qtmultimedia \
 	-skip qtscript \
 	-skip qtsensors \
 	-skip qtserialport \
-	-skip qttools \
-	-skip qttranslations \
 	-skip qtwebchannel \
 	-skip qtwebsockets \
 	-skip qtxmlpatterns \
-	-opensource -confirm-license -silent
+	-opensource -confirm-license -silent -no-warnings-are-errors
 export ANDROID_API_VERSION=android-$VER_AND_API
 export ANDROID_BUILD_TOOLS_REVISION=$VER_AND_BT
-make module-qtbase module-qtandroidextras module-qtsvg module-qtimageformats $PARALLEL $V
+make module-qtbase module-qtandroidextras module-qtsvg module-qtimageformats module-qttranslations $PARALLEL $V
 make install $V
 cd ..