Changeset 26840 for local

Show
Ignore:
Timestamp:
01.02.2013 17:33:48 (6 years ago)
Author:
davidb
Message:

Dropping back to r8b version of NDK to work with cross compiling Perl

Location:
local/greenstone3/linux-android-ndk-cross
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • local/greenstone3/linux-android-ndk-cross/PREPARE.sh

    r26831 r26840  
    11 
    2 if [ ! -d android-ndk-r8d ] ; then 
     2if [ ! -d android-ndk-r8b ] ; then 
    33 
    44  echo "Untarring Android NDK tar ball" 
    55 
    6   tar xvjf android-ndk-r8d-linux-x86.tar.bz2 
     6  tar xvjf android-ndk-r8b-linux-x86.tar.bz2 
    77fi 
    88 
     
    1313fi 
    1414 
    15 $NDK_HOME/android-ndk-r8d/build/tools/make-standalone-toolchain.sh \ 
     15$NDK_HOME/android-ndk-r8b/build/tools/make-standalone-toolchain.sh \ 
    1616  --platform=android-14 \ 
    1717  --install-dir=$NDK_HOME/android_toolchain 
  • local/greenstone3/linux-android-ndk-cross/gs3-devel.bash

    r26835 r26840  
    22export crossOS=android 
    33echo "+ Setting crossOS=$crossOS" 
     4export GSDLOS=android 
    45 
    56export NDK_HOME=`pwd` 
    6 export PATH=$NDK_HOME/android_toolchain/bin:$NDK_HOME/android-ndk-r8d:$PATH 
     7export PATH=$NDK_HOME/android_toolchain/bin:$NDK_HOME/android-ndk-r8b:$PATH 
    78 
    89echo "+ Setting NDK_HOME to $NDK_HOME" 
     
    1617export RANLIB=arm-linux-androideabi-ranlib 
    1718 
     19echo "+ Set export variables CPP, CC etc to arm-linux-androideabi-XXX" 
    1820 
    1921# Need to make sure crossOS is set before sourcing the gnome-lib ext 
     
    2325# run on the build OS (linux) and the intented final host OS (android) 
    2426 
    25 pushd ../gs2build/ext/gnome-lib 
    26 source ./devel.bash 
    27 popd 
     27 
     28if [ ! -d ../gs2build/ext/gnome-lib ] ; then 
     29  echo "Warning: Failed to detect gnome-lib extension in gs2build:" 
     30  echo "  <gsdl3home>/gs2build/ext/gnome-lib" 
     31  sleep 5; 
     32else 
     33 
     34  pushd ../gs2build/ext/gnome-lib \ 
     35    && source ./devel.bash \ 
     36    && popd 
     37fi 
    2838 
    2939source ./gs3-setup.bash 
  • local/greenstone3/linux-android-ndk-cross/gs3-setup.bash

    r26780 r26840  
    1  
    21 
    32 
     
    65if [ "x$JAVA_HOME" = "x" ] ; then 
    76 
    8   #export JAVA_HOME=/data/java/jdk1.6.0_21 
    9   export JAVA_HOME=/research/local/jdk-64bit-1.7 
     7  export JAVA_HOME=/data/java/jdk1.6.0_21 
     8  #export JAVA_HOME=/research/local/jdk-64bit-1.7 
    109 
    1110  export PATH=$JAVA_HOME/bin:$PATH