X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=57ab3d1f1115cc026c836a806accdb9fcfcfadc1;hb=3bdccc5597806fd4d6fb057b0d4d05f030694c9a;hp=eee624634b878676f4e6821640bef1250c510696;hpb=d4069d6e43094826fa2e35e4bf073d82abe7988a;p=sigrok-util.git

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index eee6246..57ab3d1 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -2,7 +2,7 @@
 ##
 ## This file is part of the sigrok-util project.
 ##
-## Copyright (C) 2013 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2013-2014 Uwe Hermann <uwe@hermann-uwe.de>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -21,16 +21,19 @@
 
 set -e
 
+# The path where the NDK, SDK, and toolchains are located.
+ANDROID_PATH=$HOME/android
+
 # The path where the Android NDK is located.
-ANDROID_NDK=$HOME/android/android-ndk-r9d
+ANDROID_NDK=$ANDROID_PATH/android-ndk-r10c
 
 # The path where the Android SDK is located.
-ANDROID_SDK=$HOME/android/android-sdk-linux
+ANDROID_SDK=$ANDROID_PATH/android-sdk-linux
 
 # The path where your Android toolchain directory is located.
-TOOLCHAIN=$HOME/android/android-arm-toolchain
-# TOOLCHAIN=$HOME/android/android-mipsel-toolchain
-# TOOLCHAIN=$HOME/android/android-i686-toolchain
+TOOLCHAIN=$ANDROID_PATH/android-arm-toolchain
+# TOOLCHAIN=$ANDROID_PATH/android-mipsel-toolchain
+# TOOLCHAIN=$ANDROID_PATH/android-i686-toolchain
 
 # Select which Android toolchain to use.
 # Don't forget to also adapt TOOLCHAIN above if you change TOOLCHAIN_TRIPLET!
@@ -66,6 +69,8 @@ VER_LIBUSB=1.0.19
 VER_PYTHON=3.3.3
 VER_BOOST=1.55.0
 VER_QT=5.3.1
+VER_NDK=10c
+VER_SDK=23.0.2
 
 SF_MIRROR=switch.dl.sourceforge.net
 
@@ -81,6 +86,33 @@ esac
 
 # -----------------------------------------------------------------------------
 
+# Get the Android NDK and SDK, install required packages and toolchains.
+if [ "x$1" = "xprepare" ]; then
+  mkdir -p $ANDROID_PATH
+  cd $ANDROID_PATH
+
+  # 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
+  cd android-ndk-r$VER_NDK
+  ./build/tools/make-standalone-toolchain.sh --platform=android-16 \
+    --toolchain=arm-linux-androideabi-4.9 \
+    --install-dir=$ANDROID_PATH/android-arm-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.0,android-8,android-10,android-11,android-14,android-16
+  cd ..
+
+  exit
+fi
+
+# -----------------------------------------------------------------------------
+
 # Remove build directory contents (if any) and create a new build dir.
 rm -rf $BUILDDIR
 mkdir $BUILDDIR
@@ -91,7 +123,7 @@ cd $BUILDDIR
 # Build host Python before we start messing with the environment.
 # Don't do parallel builds, this doesn't seem to work well.
 $WGET http://python.org/ftp/python/$VER_PYTHON/Python-$VER_PYTHON.tar.xz
-tar xJf Python-$VER_PYTHON.tar.xz
+tar xfJ Python-$VER_PYTHON.tar.xz
 cd Python-$VER_PYTHON
 ./configure
 make python
@@ -180,7 +212,7 @@ cd ../..
 
 # zlib (needed for glib and libzip)
 $WGET http://zlib.net/zlib-$VER_ZLIB.tar.gz
-tar xfvz zlib-$VER_ZLIB.tar.gz
+tar xfz zlib-$VER_ZLIB.tar.gz
 cd zlib-$VER_ZLIB
 # Note: zlib's configure doesn't understand --host, we need to pass $CC.
 CC=$TOOLCHAIN_TRIPLET-gcc ./configure --prefix=$PREFIX
@@ -190,7 +222,7 @@ cd ..
 
 # pcre (needed for glib)
 $WGET ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$VER_PCRE.tar.gz
-tar xfvz pcre-$VER_PCRE.tar.gz
+tar xfz pcre-$VER_PCRE.tar.gz
 cd pcre-$VER_PCRE
 ./configure $C --disable-cpp
 make $PARALLEL
@@ -208,7 +240,7 @@ cd ..
 
 # 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
+tar xfJ glib-$VER_GLIB.tar.xz
 cd glib-$VER_GLIB
 ./autogen.sh
 # Note: Manual LDFLAGS/CPPFLAGS needed for libiconv, rest uses pkg-config.
@@ -242,7 +274,7 @@ 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=OFF .
+cmake $CM -DFTDIPP=no -DDOCUMENTATION=no -DEXAMPLES=no -DFTDI_EEPROM=no -DPYTHON_BINDINGS=no .
 make $PARALLEL
 make install
 cd ..
@@ -251,10 +283,12 @@ cd ..
 $GIT_CLONE git://sigrok.org/libserialport
 cd libserialport
 ./autogen.sh
-./configure $C
+mkdir build
+cd build
+../configure $C
 make $PARALLEL V=1
 make install
-cd ..
+cd ../..
 
 # Build dependencies for libsigrok bindings if needed
 
@@ -262,20 +296,20 @@ if [ x"$CPPFLAGS_STL" != x ]; then
 
   # libsigc++ (needed for glibmm)
   $WGET http://ftp.gnome.org/pub/gnome/sources/libsigc++/$VER_LIBSIGCXX_SHORT/libsigc++-$VER_LIBSIGCXX.tar.xz
-  tar xJf libsigc++-$VER_LIBSIGCXX.tar.xz
+  tar xfJ libsigc++-$VER_LIBSIGCXX.tar.xz
   cd libsigc++-$VER_LIBSIGCXX
   cp -f ../config/config.guess build
   cp -f ../config/config.sub build
-  CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL -lgnustl_shared" ./configure $C
+  CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL -lgnustl_shared" ./configure --disable-documentation $C
   make $PARALLEL
   make install
   cd ..
 
   # glibmm (needed for libsigrok bindings)
   $WGET http://ftp.gnome.org/pub/gnome/sources/glibmm/$VER_GLIB_SHORT/glibmm-$VER_GLIB.tar.xz
-  tar xJf glibmm-$VER_GLIB.tar.xz
+  tar xfJ glibmm-$VER_GLIB.tar.xz
   cd glibmm-$VER_GLIB
-  CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL -lgnustl_shared" ./configure $C
+  CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL -lgnustl_shared" ./configure --disable-documentation $C
   make $PARALLEL
   make install
   cd ..
@@ -286,28 +320,34 @@ fi
 $GIT_CLONE git://sigrok.org/libsigrok
 cd libsigrok
 ./autogen.sh
-CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL" ./configure $C $BINDINGS_CONFIG --datadir=/sdcard
+mkdir build
+cd build
+CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL" ../configure $C $BINDINGS_CONFIG --datadir=/sdcard
 make $PARALLEL V=1
 make datadir='$(datarootdir)' install
-cd ..
+cd ../..
 
 # libsigrokdecode
 $GIT_CLONE git://sigrok.org/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
-./configure $C
+mkdir build
+cd build
+../configure $C
 make $PARALLEL V=1
 make install
-cd ..
+cd ../..
 
 # sigrok-cli
 $GIT_CLONE git://sigrok.org/sigrok-cli
 cd sigrok-cli
 ./autogen.sh
-./configure $C
+mkdir build
+cd build
+../configure $C
 make $PARALLEL V=1
 make install
-cd ..
+cd ../..
 
 # Check if we have all requirements to build PulseView:
 
@@ -362,11 +402,16 @@ make $PARALLEL V=1
 make install
 cd ..
 
+# Strip all shared libs to reduce size.
+find $PREFIX -iname "*.so" -exec ${TOOLCHAIN_TRIPLET}-strip -S {} \;
+
 # PulseView
 $GIT_CLONE git://sigrok.org/pulseview
 cd pulseview
 cmake $CM -DANDROID_STL_PATH=${ANDROID_NDK}/sources/cxx-stl .
 make $PARALLEL VERBOSE=1
+make install
+${TOOLCHAIN_TRIPLET}-strip -S libs/$TARGET_ARCH/libpulseview.so
 cd android
 "${ANDROID_SDK}/tools/android" update project -p . -t android-14 -n PulseView
 ant debug