Add Android 4.1+ support. See doc/README-Android.md for build HOWTO.

* Update CMake files to work with android-cmake
* Use unix domain socket for communicating with Android GUI
* May also run standalone but requires rooted Android device

2 files changed, 168 insertions, 0 deletions

diff --git a/doc/README-Android.md b/doc/README-Android.md
new file mode 100644
index 0000000..975a679
--- /dev/null
+++ b/doc/README-Android.md
@@ -0,0 +1,23 @@
+fastd for Android
+=================
+
+Runtime Requirements
+--------------------
+* Android 4.1+
+* x86 / ARMv7a
+  * NEON optimiazation is planned but not currently required
+  * Not tested with x86\_64 or AArch64 but should work too
+
+How to Build
+------------
+* Android NDK r10d+ (r10c or older versions won't work)
+    * make sure ANDROID\_NDK\_HOME is set
+* Ubuntu 12.04+
+    * `sudo apt-get install build-essential automake bison cmake libtool pkg-config`
+    * For Ubuntu **12.04**: cmake 2.8.7 won't work; get a newer version from https://launchpad.net/~kalakris/+archive/ubuntu/cmake
+* or Mac OS X 10.10+ (older versions should work too)
+    * Homebrew
+    * `brew install automake libtool cmake bison`
+
+Then run `doc/build-fastd-android.sh` from `fastd-android` folder. Be warned the script is not perfect; you may need to look into it should anything go wrong.
+
diff --git a/doc/build-fastd-android.sh b/doc/build-fastd-android.sh
new file mode 100755
index 0000000..145f9c4
--- /dev/null
+++ b/doc/build-fastd-android.sh
@@ -0,0 +1,145 @@
+# Helper script for building fastd-android and its dependencies
+#!/bin/bash
+
+if [ x${PWD##*/} == xdoc ]; then
+    echo "Warning: it seems you're currently in the doc/ folder. This script needs to run under the top folder of fastd source code."
+    echo "See README-Android.md for more info."
+    exit 1
+fi
+
+echo "This script downloads and builds dependencies for fastd-android, as well as fastd-android itself."
+echo "Make sure you have these packages installed:"
+echo "  * Android NDK r10d or newer"
+echo "  * for Debian/Ubuntu: sudo apt-get install curl build-eseentials automake bison cmake git libtool pkg-config"
+echo "    - Ubuntu 12.04 users need to grab cmake 2.8.9 or newer. See README-Android.md for more info."
+echo "  * for Mac OS X: brew install automake libtool cmake bison"
+echo "Hit ctrl-c now if you don't have all needed stuff yet."
+read
+
+SODIUM_VER=1.0.1
+UECC_VER=4
+LIBSODIUM_PATH=libsodium-${SODIUM_VER}
+LIBUECC_PATH=libuecc-${UECC_VER}
+ANDROID_NATIVE_LEVEL=16
+
+if [ x$ANDROID_NDK_HOME == x ]; then
+    echo "Set ANDROID_NDK_HOME first"; exit 1;
+fi
+
+if [ ! -d "build" ]; then
+    mkdir build
+fi
+
+pushd build > /dev/null
+WORK_DIR=${PWD}
+
+if [ -d "${LIBSODIUM_PATH}" ]; then
+    echo "It seems you already have libsodium downloaded.";
+else
+    echo "Downloading libsodium ${SODIUM_VER}..."
+    curl -L https://github.com/jedisct1/libsodium/releases/download/${SODIUM_VER}/libsodium-${SODIUM_VER}.tar.gz | tar zxf - || exit 1
+fi
+
+pushd ${LIBSODIUM_PATH} > /dev/null
+if [ ! -f "dist-build/android-armv7.sh" ]; then
+    echo "Patching libsodium build scripts..."
+    sed -i.bak 's/--enable-minimal//' dist-build/android-build.sh
+    sed -e 's/-mthumb -marm -march=armv6/-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16/' dist-build/android-arm.sh > dist-build/android-armv7.sh
+    chmod +x dist-build/android-armv7.sh
+fi
+if [ ! -d "libsodium-android-arm" ]; then
+    dist-build/android-armv7.sh || exit 2
+    # for static link using cmake
+    rm libsodium-android-arm/lib/libsodium.so
+fi
+if [ ! -d "libsodium-android-x86" ]; then
+    dist-build/android-x86.sh || exit 2
+    # for static link using cmake
+    rm libsodium-android-x86/lib/libsodium.so
+fi
+popd > /dev/null
+
+if [ -d "android-cmake" ]; then
+    echo "It seems you already have android-cmake downloaded.";
+else
+    echo "Downloading android-cmake"
+    git clone https://github.com/taka-no-me/android-cmake.git;
+fi
+CMAKE_TOOLCHAIN=${WORK_DIR}/android-cmake/android.toolchain.cmake
+ANDROID_CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN}"
+echo ">> android-cmake ready."
+
+CMAKE_COMMON_DEFS="-DCMAKE_BUILD_TYPE=Release -DANDROID_NDK=${ANDROID_NDK_HOME} -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_LEVEL}"
+
+if [ -d "${LIBUECC_PATH}" ]; then
+    echo "It seems you already have libuecc downloaded.";
+else
+    curl -k -L https://projects.universe-factory.net/attachments/download/71/libuecc-${UECC_VER}.tar.xz | tar Jxf - || exit 4
+fi
+for ARCH in arm x86; do
+    BUILD_DIR=libuecc-${ARCH}
+    if [ ! -d "${BUILD_DIR}" ]; then
+        mkdir ${BUILD_DIR} && pushd ${BUILD_DIR} > /dev/null
+        if [ ${ARCH} == arm ]; then
+            _USE_ABI="armeabi-v7a"
+        else
+            _USE_ABI=${ARCH}
+        fi
+        ${ANDROID_CMAKE} -DANDROID_ABI="$_USE_ABI" ${CMAKE_COMMON_DEFS} -DCMAKE_INSTALL_PREFIX=`pwd`/output ../${LIBUECC_PATH} || exit 5
+        make && make install || exit 6
+        # for static link using cmake
+        rm output/lib/libuecc.so*
+        popd > /dev/null;
+        echo ">> libuecc ${ARCH} built."
+    fi
+done
+
+if [ ! -d "pkgconfig" ]; then
+    mkdir pkgconfig
+    for ARCH in arm x86; do
+        mkdir pkgconfig/${ARCH}
+        cp libuecc-${ARCH}/output/lib/pkgconfig/libuecc.pc pkgconfig/${ARCH}
+        cp ${LIBSODIUM_PATH}/libsodium-android-${ARCH}/lib/pkgconfig/libsodium.pc pkgconfig/${ARCH}
+    done
+    echo ">> pkgconfig files prepared."
+fi
+
+# detect HomeBrew installed bison for OS X
+HOMEBREW_BISON_PATH=`find /usr/local/Cellar/bison -name bin`
+if [ x${HOMEBREW_BISON_PATH} != x ]; then
+    USE_PATH=${HOMEBREW_BISON_PATH}:$PATH
+else
+    USE_PATH=$PATH
+fi
+
+FASTD_ANDROID_DEFS="-DWITH_CAPABILITIES=OFF -DWITH_STATUS_SOCKET=OFF -DWITH_CIPHER_AES128_CTR=FALSE -DWITH_METHOD_XSALSA20_POLY1305=FALSE -DWITH_METHOD_GENERIC_POLY1305=FALSE -DWITH_CMDLINE_COMMANDS=FALSE"
+
+for ARCH in arm x86; do
+    BUILD_DIR=fastd-${ARCH}
+    if [ ! -d "BUILD_DIR" ]; then
+        mkdir ${BUILD_DIR}
+    fi
+    pushd ${BUILD_DIR} > /dev/null
+    if [ ! -f "Makefile" ]; then
+        if [ ${ARCH} == arm ]; then
+            _USE_ABI="armeabi-v7a"
+            ADD_DEFS="-DWITH_CIPHER_SALSA2012_NACL=TRUE -DWITH_CIPHER_SALSA20_NACL=TRUE"
+        else
+            _USE_ABI=${ARCH}
+            ADD_DEFS="-DWITH_CIPHER_SALSA2012_NACL=FALSE -DWITH_CIPHER_SALSA20_NACL=FALSE"
+        fi
+
+        PATH=${USE_PATH} PKG_CONFIG_LIBDIR=../pkgconfig/${ARCH} \
+            ${ANDROID_CMAKE} \
+            -DANDROID_ABI="$_USE_ABI" ${CMAKE_COMMON_DEFS} \
+            ${FASTD_ANDROID_DEFS} \
+            ${ADD_DEFS} -DEXECUTABLE_OUTPUT_PATH=`pwd` \
+            ../.. || exit 7
+    fi
+
+    make && echo ">> fastd ${ARCH} build ready in build/${BUILD_DIR}"
+    popd > /dev/null
+done
+
+popd > /dev/null
+