X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=a26f568f0ef0bb5a4d9eacbaec7a7bac7e7ca00a;hp=30519f7824fa8cf48985e20ad7f9f82b7d7b1eeb;hb=f54556e78d7ccd183adb27da4b262d34c05b0819;hpb=10adf5499c9f36c0958a65c5502c8f2da65ee5db
diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 30519f7..a26f568 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -16,8 +16,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+## along with this program; if not, see .
##
set -e
@@ -26,16 +25,16 @@ set -e
ANDROID_PATH=$HOME/android
# The path where the Android NDK is located.
-ANDROID_NDK=$ANDROID_PATH/android-ndk-r10d
+ANDROID_NDK=$ANDROID_PATH/android-ndk-r10e
# The path where the Android SDK is located.
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-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/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
@@ -62,28 +61,36 @@ PARALLEL="-j 2"
# -----------------------------------------------------------------------------
VER_LIBICONV=1.14
-VER_GETTEXT=0.19.4
-VER_ZLIB=1.2.8
-VER_PCRE=8.36
+VER_GETTEXT=0.19.7
+VER_ZLIB=1.2.11
+VER_PCRE=8.38
VER_LIBFFI=3.2.1
-VER_GLIB=2.43.3
-VER_GLIB_SHORT=2.43
-VER_LIBSIGCXX=2.4.0
-VER_LIBSIGCXX_SHORT=2.4
-VER_LIBZIP=0.11.2
+VER_GLIB=2.48.1
+VER_GLIB_SHORT=2.48
+VER_GLIBMM=2.48.1
+VER_GLIBMM_SHORT=2.48
+VER_LIBSIGCXX=2.9.2
+VER_LIBSIGCXX_SHORT=2.9
+VER_LIBZIP=1.1
VER_LIBFTDI1=1.2
VER_LIBUSB=1.0.19
VER_PYTHON=3.3.3
-VER_BOOST=1.57.0
-VER_QT=5.3.1
-VER_NDK=10d
-VER_SDK=23.0.2
+VER_BOOST=1.58.0
+VER_QT=5.6.0
+VER_QT_SHORT=5.6
+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
+VER_AND_API=16 # Target Android API version
SF_MIRROR=download.sourceforge.net
-WGET="wget --quiet"
+WGET="wget -c --quiet"
GIT_CLONE="git clone --depth=1"
+REPO_BASE="git://sigrok.org"
+
case "$TOOLCHAIN_TRIPLET" in
arm*) TARGET_ARCH=armeabi;;
mips*) TARGET_ARCH=mips;;
@@ -101,18 +108,24 @@ if [ "x$1" = "xprepare" ]; then
# NDK
$WGET http://dl.google.com/android/ndk/android-ndk-r$VER_NDK-linux-x86.bin
chmod 700 android-ndk-r$VER_NDK-linux-x86.bin
- ./android-ndk-r$VER_NDK-linux-x86.bin
+ ./android-ndk-r$VER_NDK-linux-x86.bin -y
cd android-ndk-r$VER_NDK
- ./build/tools/make-standalone-toolchain.sh --platform=android-16 \
+ ./build/tools/make-standalone-toolchain.sh --platform=android-$VER_AND_API \
--toolchain=arm-linux-androideabi-4.9 \
--install-dir=$ANDROID_PATH/android-arm-toolchain
+ ./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
$WGET http://dl.google.com/android/android-sdk_r$VER_SDK-linux.tgz
tar xfz android-sdk_r$VER_SDK-linux.tgz
cd android-sdk-linux
- ./tools/android update sdk --no-ui --filter platform-tools,build-tools-21.1.2,android-8,android-10,android-11,android-14,android-16
+ echo y | ./tools/android update sdk --no-ui --all --filter platform-tools,build-tools-$VER_AND_BT,android-$VER_AND_API
cd ..
exit
@@ -153,7 +166,7 @@ if test -d "$TOOLCHAIN"/sysroot; then
SYSROOT=
else
STANDALONE_TOOLCHAIN=
- NATIVE_API_LEVEL=16
+ NATIVE_API_LEVEL=$VER_AND_API
SYSROOT_DIR=${ANDROID_NDK}/platforms/android-${NATIVE_API_LEVEL}/arch-${TARGET_ARCH%eabi*}
if [ ! -d "$SYSROOT_DIR" ]; then
echo >&2 "Can't build with NDK toolchain; sysroot $SYSROOT_DIR is missing"
@@ -178,6 +191,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
@@ -196,10 +210,10 @@ fi
# -----------------------------------------------------------------------------
# Get the latest versions of config.guess/config.sub that know about Android.
-$GIT_CLONE git://git.savannah.gnu.org/config.git
+$GIT_CLONE http://git.savannah.gnu.org/r/config.git
# Get a toolchain for cmake that knows about Android.
-$WGET https://android-cmake.googlecode.com/hg/toolchain/android.toolchain.cmake
+$WGET https://raw.githubusercontent.com/arithran/android-cmake/master/toolchain/android.toolchain.cmake
patch < ../android.toolchain.cmake.patch android.toolchain.cmake
# -----------------------------------------------------------------------------
@@ -212,6 +226,9 @@ autoreconf
patch -p1 < ../../Python-$VER_PYTHON.patch
ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no ac_cv_func_pipe2=no ac_cv_func_fdatasync=no ac_cv_func_killpg=no ac_cv_func_waitid=no ac_cv_func_sigaltstack=no ./configure $C --build=x86_64-linux-gnu --disable-ipv6
sed -i "s/^#zlib/zlib/g" Modules/Setup
+sed -i "s/^#math/math/g" Modules/Setup
+sed -i "s/^#time/time/g" Modules/Setup
+sed -i "s/^#_struct/_struct/g" Modules/Setup
make PYTHON_FOR_BUILD='_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) ./hostpython' install $V
cd ..
@@ -257,10 +274,10 @@ make install $V
cd ..
# pcre (needed for glib)
-$WGET ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$VER_PCRE.tar.gz
+$WGET https://ftp.pcre.org/pub/pcre/pcre-$VER_PCRE.tar.gz
tar xfz pcre-$VER_PCRE.tar.gz
cd pcre-$VER_PCRE
-./configure $C --disable-cpp
+./configure $C --disable-cpp --enable-utf --enable-unicode-properties
make $PARALLEL $V
make install $V
cd ..
@@ -310,13 +327,13 @@ cd ..
$WGET http://www.intra2net.com/en/developer/libftdi/download/libftdi1-$VER_LIBFTDI1.tar.bz2
tar xfj libftdi1-$VER_LIBFTDI1.tar.bz2
cd libftdi1-$VER_LIBFTDI1
-cmake $CM -DFTDIPP=no -DDOCUMENTATION=no -DEXAMPLES=no -DFTDI_EEPROM=no -DPYTHON_BINDINGS=no .
+cmake $CM -DFTDIPP=no -DDOCUMENTATION=no -DEXAMPLES=no -DFTDI_EEPROM=no -DPYTHON_BINDINGS=no -DBUILD_TESTS=n .
make $PARALLEL $V
make install $V
cd ..
# libserialport
-$GIT_CLONE git://sigrok.org/libserialport
+$GIT_CLONE $REPO_BASE/libserialport
cd libserialport
./autogen.sh
mkdir build
@@ -342,9 +359,9 @@ if [ x"$CPPFLAGS_STL" != x ]; then
cd ..
# glibmm (needed for libsigrok bindings)
- $WGET http://ftp.gnome.org/pub/gnome/sources/glibmm/$VER_GLIB_SHORT/glibmm-$VER_GLIB.tar.xz
- tar xfJ glibmm-$VER_GLIB.tar.xz
- cd glibmm-$VER_GLIB
+ $WGET http://ftp.gnome.org/pub/gnome/sources/glibmm/$VER_GLIBMM_SHORT/glibmm-$VER_GLIBMM.tar.xz
+ tar xfJ glibmm-$VER_GLIBMM.tar.xz
+ cd glibmm-$VER_GLIBMM
CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL -lgnustl_shared" ./configure --disable-documentation $C
make $PARALLEL $V
make install $V
@@ -353,18 +370,18 @@ if [ x"$CPPFLAGS_STL" != x ]; then
fi
# libsigrok
-$GIT_CLONE git://sigrok.org/libsigrok
+$GIT_CLONE $REPO_BASE/libsigrok
cd libsigrok
./autogen.sh
mkdir build
cd build
-CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL" ../configure $C $BINDINGS_CONFIG --datadir=/sdcard
+CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL" JAVAC="javac -source 1.6 -target 1.6" ../configure $C $BINDINGS_CONFIG --datadir=/sdcard
make $PARALLEL $V
make datadir='$(datarootdir)' install $V
cd ../..
# libsigrokdecode
-$GIT_CLONE git://sigrok.org/libsigrokdecode
+$GIT_CLONE $REPO_BASE/libsigrokdecode
cd libsigrokdecode
./autogen.sh
mkdir build
@@ -374,8 +391,26 @@ make $PARALLEL $V
make install $V
cd ../..
+# sigrok-firmware
+$GIT_CLONE $REPO_BASE/sigrok-firmware
+cd sigrok-firmware
+./autogen.sh
+mkdir build
+cd build
+../configure $C
+make $PARALLEL $V
+make install $V
+cd ../..
+
+# sigrok-firmware-fx2lafw
+$WGET http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-$VER_SIGROK_FIRMWARE_FX2LAFW.tar.gz
+tar xfz sigrok-firmware-fx2lafw-bin-$VER_SIGROK_FIRMWARE_FX2LAFW.tar.gz
+cd sigrok-firmware-fx2lafw-bin-$VER_SIGROK_FIRMWARE_FX2LAFW
+cp *.fw $PREFIX/share/sigrok-firmware/
+cd ..
+
# sigrok-cli
-$GIT_CLONE git://sigrok.org/sigrok-cli
+$GIT_CLONE $REPO_BASE/sigrok-cli
cd sigrok-cli
./autogen.sh
mkdir build
@@ -392,13 +427,8 @@ if [ -z "$ANDROID_NDK" -o ! -d "$ANDROID_NDK" ]; then
exit 0
fi
-if [ -z "$ANDROID_SDK" -o \
- ! -d "$ANDROID_SDK"/platforms/android-8 -o \
- ! -d "$ANDROID_SDK"/platforms/android-10 -o \
- ! -d "$ANDROID_SDK"/platforms/android-11 -o \
- ! -d "$ANDROID_SDK"/platforms/android-14 -o \
- ! -d "$ANDROID_SDK"/platforms/android-16 ]; then
- echo "Android SDK with platforms 8 10 11 14 16 not available, not building PulseView."
+if [ -z "$ANDROID_SDK" -o ! -d "$ANDROID_SDK"/platforms/android-$VER_AND_API ]; then
+ echo "Android SDK with platform $VER_AND_API not available, not building PulseView."
exit 0
fi
@@ -413,26 +443,52 @@ NDK_HOST=`"$ANDROID_NDK/ndk-build" -p 2>/dev/null | awk '$1 == "HOST_TAG" { prin
$WGET http://$SF_MIRROR/project/boost/boost/$VER_BOOST/boost_${VER_BOOST//./_}.tar.bz2
tar xfj boost_${VER_BOOST//./_}.tar.bz2
cd boost_${VER_BOOST//./_}
-CC= ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system,thread,test --without-icu
+patch -p0 < ../../boost_wchar.patch
+CC= ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system,serialization,test --without-icu
echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : \"$SYSROOT -I$PREFIX/include $CPPFLAGS_STL\" \"$SYSROOT -L$PREFIX/lib $LDFLAGS_STL -lgnustl_shared\" ;" > user-config.jam
./b2 -q -d+2 --ignore-site-config --user-config=user-config.jam toolset=gcc variant=release link=shared threading=multi runtime-link=shared target-os=android --prefix=$PREFIX --layout=system install $PARALLEL
cd ..
# Qt (needed for PulseView)
-$WGET http://download.qt-project.org/official_releases/qt/${VER_QT%.*}/${VER_QT}/single/qt-everywhere-opensource-src-${VER_QT}.tar.gz
-tar xfz qt-everywhere-opensource-src-${VER_QT}.tar.gz
+$WGET http://download.qt.io/official_releases/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
-CC= CXX= ./configure --prefix="$PREFIX" -developer-build -xplatform android-g++ -nomake tests -nomake examples -android-sdk "$ANDROID_SDK" -android-ndk "$ANDROID_NDK" -android-ndk-host "$NDK_HOST" -android-arch "$TARGET_ARCH" -android-toolchain-version "$NDK_TOOLCHAIN_VERSION" -skip qttranslations -skip qtwebkit -skip qtserialport -skip qtwebkit-examples -skip qtlocation -skip qtconnectivity -opensource -confirm-license -silent
+CC= CXX= ./configure \
+ --prefix="$PREFIX" \
+ -developer-build \
+ -xplatform android-g++ \
+ -nomake tests \
+ -nomake examples \
+ -android-sdk "$ANDROID_SDK" \
+ -android-ndk "$ANDROID_NDK" \
+ -android-ndk-host "$NDK_HOST" \
+ -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 -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 install $V
cd ..
# sigrok-androidutils
-$GIT_CLONE git://sigrok.org/sigrok-androidutils
+$GIT_CLONE $REPO_BASE/sigrok-androidutils
cd sigrok-androidutils
./autogen.sh
-./configure $C --with-android-sdk="${ANDROID_SDK}"
+./configure $C --with-android-sdk="${ANDROID_SDK}" --with-android-platform=android-$VER_AND_API
make $PARALLEL $V
make install $V
cd ..
@@ -441,14 +497,14 @@ cd ..
find $PREFIX -iname "*.so" -exec ${TOOLCHAIN_TRIPLET}-strip -S {} \;
# PulseView
-$GIT_CLONE git://sigrok.org/pulseview
+$GIT_CLONE $REPO_BASE/pulseview
cd pulseview
+patch -p1 < ../../pv_cmake_pkgconfig_fix.patch
+sed -i -e "s,\t\tandroid:versionName=.*$,\t\tandroid:versionName=\"`date -Iseconds`\"," android/AndroidManifest.xml
cmake $CM -DENABLE_TESTS=y .
make $PARALLEL $V
-make install $V
${TOOLCHAIN_TRIPLET}-strip -S libs/$TARGET_ARCH/libpulseview.so
cd android
-"${ANDROID_SDK}/tools/android" update project -p . -t android-14 -n PulseView
+"${ANDROID_SDK}/tools/android" update project -p . -t android-$VER_AND_API -n PulseView
ant debug
cd ../..
-