Changeset 26835 for local

Timestamp:

2013-02-01T15:06:53+13:00 (11 years ago)

Author:

davidb

Message:

Merging devel.bash files from 'android-ndk' and 'local'

File:

• local/greenstone3/linux-android-ndk-cross/gs3-devel.bash (modified) (1 diff)

local/greenstone3/linux-android-ndk-cross/gs3-devel.bash

@@ -3 +3 @@
 echo "+ Setting crossOS=$crossOS"
 
-if [ ! -d ../ext/android-ndk ] ; then
-  echo "Warning: Failed to detect Android NDK extension:"
-  echo "  <gsdl3home>/ext/android-ndk"
-  echo "Assuming your environment is set up independently to compile with NDK"
-  sleep 3;
-else
+export NDK_HOME=`pwd`
+export PATH=$NDK_HOME/android_toolchain/bin:$NDK_HOME/android-ndk-r8d:$PATH
 
-  pushd ../ext/android-ndk
-  source ./devel.bash
-  popd
-fi
+echo "+ Setting NDK_HOME to $NDK_HOME"
+echo "+ Updating PATH to include 'android_toolchain/bin/' and 'ndk-build'"
+
+export CPP=arm-linux-androideabi-cpp
+export CC=arm-linux-androideabi-gcc
+export CXX=arm-linux-androideabi-g++
+export LD=arm-linux-androideabi-ld
+export AR=arm-linux-androideabi-ar
+export RANLIB=arm-linux-androideabi-ranlib
+
 
 # Need to make sure crossOS is set before sourcing the gnome-lib ext