X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=937f579aaea4a73040ad4c21e5e1fe74ccab3534;hp=f270f1462192ef854f8d28b540d18b3918f51707;hb=bb260ef2b02ca67b0497dbdf321232bd2456faac;hpb=7744cf5c98a0373082529ed026fc7833009910e5

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index f270f14..937f579 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -21,11 +21,11 @@
 
 set -e
 
-# The path where Android NDK is located.
-ANDROID_NDK=/usr/local/android-ndk-r9d
+# The path where the Android NDK is located.
+ANDROID_NDK=$HOME/android/android-ndk-r9d
 
-# The path where Android SDK is located.
-ANDROID_SDK=/usr/local/android
+# The path where the Android SDK is located.
+ANDROID_SDK=$HOME/android/android-sdk-linux
 
 # The path where your Android toolchain directory is located.
 TOOLCHAIN=$HOME/android/android-arm-toolchain
@@ -63,7 +63,7 @@ VER_LIBFTDI1=1.1
 VER_LIBUSBX=1.0.17
 VER_PYTHON=3.3.3
 VER_BOOST=1.55.0
-VER_QT=5.2.1
+VER_QT=5.3.1
 
 SF_MIRROR=switch.dl.sourceforge.net
 
@@ -74,7 +74,7 @@ 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;;
+  *) echo >&2 "Unknown prefix for TOOLCHAIN_TRIPLET."; exit 1;;
 esac
 
 # -----------------------------------------------------------------------------
@@ -84,15 +84,15 @@ rm -rf $BUILDDIR
 mkdir $BUILDDIR
 cd $BUILDDIR
 
+# -----------------------------------------------------------------------------
+
 # Build host Python before we start messing with the environment.
 $WGET http://python.org/ftp/python/$VER_PYTHON/Python-$VER_PYTHON.tar.xz
 tar xJf Python-$VER_PYTHON.tar.xz
 cd Python-$VER_PYTHON
 ./configure
 make python $PARALLEL
-make Parser/pgen $PARALLEL
 mv python hostpython
-mv Parser/pgen Parser/hostpgen
 cd ..
 
 # -----------------------------------------------------------------------------
@@ -108,11 +108,13 @@ export -n PKG_CONFIG_PATH
 C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX"
 CM="-Wno-dev -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake -DANDROID_ABI=${TARGET_ARCH} -DCMAKE_INSTALL_PREFIX=${PREFIX} -DANDROID_STANDALONE_TOOLCHAIN=${TOOLCHAIN}"
 
+# -----------------------------------------------------------------------------
+
 # Get the latest versions of config.guess/config.sub that know about Android.
 $GIT_CLONE git://git.savannah.gnu.org/config.git
 
-# Get a toolchain for cmake that knows about Android
-wget https://android-cmake.googlecode.com/hg/toolchain/android.toolchain.cmake
+# Get a toolchain for cmake that knows about Android.
+$WGET https://android-cmake.googlecode.com/hg/toolchain/android.toolchain.cmake
 patch < ../android.toolchain.cmake.patch android.toolchain.cmake
 
 # -----------------------------------------------------------------------------
@@ -124,7 +126,7 @@ 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
-make HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen install $PARALLEL
+make PYTHON_FOR_BUILD=./hostpython install $PARALLEL
 cd ..
 
 # libiconv (needed for glib)
@@ -186,7 +188,7 @@ make $PARALLEL
 make install
 cd ..
 
-# glib
+# glib (needed for libsigrok)
 $WGET http://ftp.gnome.org/pub/gnome/sources/glib/$VER_GLIB_SHORT/glib-$VER_GLIB.tar.xz
 tar xJf glib-$VER_GLIB.tar.xz
 cd glib-$VER_GLIB
@@ -197,7 +199,7 @@ make $PARALLEL
 make install
 cd ..
 
-# libzip
+# libzip (needed for libsigrok)
 $WGET http://www.nih.at/libzip/libzip-$VER_LIBZIP.tar.gz
 tar xfz libzip-$VER_LIBZIP.tar.gz
 cd libzip-$VER_LIBZIP
@@ -208,7 +210,7 @@ make $PARALLEL
 make install
 cd ..
 
-# libusb-1.0
+# libusb-1.0 (needed for libsigrok)
 $WGET http://$SF_MIRROR/project/libusbx/releases/$VER_LIBUSBX/source/libusbx-$VER_LIBUSBX.tar.bz2
 tar xfj libusbx-$VER_LIBUSBX.tar.bz2
 cd libusbx-$VER_LIBUSBX
@@ -218,7 +220,7 @@ make $PARALLEL
 make install
 cd ..
 
-# libftdi1
+# libftdi1 (needed for libsigrok)
 $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
@@ -240,7 +242,7 @@ cd ..
 $GIT_CLONE git://sigrok.org/libsigrok
 cd libsigrok
 ./autogen.sh
-./configure $C
+./configure $C --datadir=/sdcard
 make $PARALLEL V=1
 make install
 cd ..
@@ -263,74 +265,67 @@ make $PARALLEL V=1
 make install
 cd ..
 
-
-# Check if we have kit to build PulseView
+# Check if we have all requirements to build PulseView:
 
 if [ -z "$ANDROID_NDK" -o ! -d "$ANDROID_NDK" ]; then
-  echo "Android NDK not available, not building PulseView"
+  echo "Android NDK not available, not building PulseView."
   exit 0
 fi
 
-if [ -z "$ANDROID_SDK" -o ! -d "$ANDROID_SDK"/platforms/android-8 -o \
+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"
+  echo "Android SDK with platforms 8 10 11 14 16 not available, not building PulseView."
   exit 0
 fi
 
-ANDROID_TOOLS=${ANDROID_SDK}/tools
-ANDROID_BUILD_TOOLS=${ANDROID_SDK}/build-tools/19.0.1
-
-if [ ! -e "$ANDROID_TOOLS/android" -o ! -e "$ANDROID_BUILD_TOOLS/dx" ]; then
-  echo "Essential Android build tools not available, not building PulseView"
+if [ ! -e "${ANDROID_SDK}/tools/android" ]; then
+  echo "Essential Android build tools not available, not building PulseView."
   exit 0
 fi
 
 NDK_TOOLCHAIN_VERSION=`${TOOLCHAIN_TRIPLET}-gcc --version | head -1 | sed -e 's/.* \([0-9]\+\.[0-9.]\+\)\( \|.*\)$/\1/'`
 NDK_HOST=`"$ANDROID_NDK/ndk-build" -p 2>/dev/null | awk '$1 == "HOST_TAG" { print $3 }'`
 
-
-# boost (needed for PulseView)
+# Boost (needed for PulseView)
 $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//./_}
 patch -p1 < ../../boost.patch
 ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system --without-icu
-echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : <cxxflags>\"-I$PREFIX/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH}/include\" <linkflags>\"-L$PREFIX/lib -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH} -lgnustl_shared\" ;" > user-config.jam
+echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : <cxxflags>\"-I$PREFIX/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH}/include\" <linkflags>\"-L$PREFIX/lib -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH} -Wl,-rpath=${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH} -lgnustl_shared\" ;" > user-config.jam
 ./b2 -q -d+2 --user-config=user-config.jam toolset=gcc variant=release link=shared threading=multi runtime-link=shared target-os=android --prefix=$PREFIX --layout=system install
 cd ..
 
-# qt (needed for PulseView)
+# 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
 cd qt-everywhere-opensource-src-${VER_QT}
 patch -p1 < ../../android-qt.patch
-./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 -opensource -confirm-license
+./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
 make $PARALLEL
 make install
 cd ..
 
+# sigrok-androidutils
+$GIT_CLONE git://sigrok.org/sigrok-androidutils
+cd sigrok-androidutils
+./autogen.sh
+./configure $C --with-android-sdk="${ANDROID_SDK}"
+make $PARALLEL V=1
+make install
+cd ..
+
 # PulseView
 $GIT_CLONE git://sigrok.org/pulseview
 cd pulseview
-patch -p1 < ../../pulseview-cpp.patch
 cmake $CM -DANDROID_STL_PATH=${ANDROID_NDK}/sources/cxx-stl .
-make $PARALLEL
-cp -r "$PREFIX"/src/android/java .
-cp -r libs java/
-mkdir -p java/res/drawable
-cp icons/sigrok-logo-notext.png java/res/drawable/logo.png
-cd java
-patch -p2 < ../../../pulseview-java.patch
-cp "$PREFIX"/jar/QtAndroid-bundled.jar libs/
-cp "$PREFIX"/jar/QtAndroidAccessibility-bundled.jar libs/
-mkdir -p assets
-READELF=$TOOLCHAIN_TRIPLET-readelf ../../../fix-libraries.sh "$PREFIX/lib" libs/"$TARGET_ARCH" libpulseview.so > assets/liblist.txt
-cp -r "$PREFIX"/lib/python3.3 assets/
-cp -r "$PREFIX"/share/libsigrokdecode assets/
-cp ${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH}/libgnustl_shared.so libs/${TARGET_ARCH}/
-"$ANDROID_TOOLS/android" update project -p . -t android-14 -n PulseView
+make $PARALLEL VERBOSE=1
+cd android
+"${ANDROID_SDK}/tools/android" update project -p . -t android-14 -n PulseView
 ant debug
 cd ../..
+