Changeset 26835

Show
Ignore:
Timestamp:
01.02.2013 15:06:53 (6 years ago)
Author:
davidb
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • local/greenstone3/linux-android-ndk-cross/gs3-devel.bash

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