Merge branch 'Mono2.6.x-Unity3.x' of github.com:Unity-Technologies/mono into Mono2.6.x-Unity3.x

add_to_build_results/monodistribution/bin/mono-env

@@ -3,4 +3,4 @@ MONO=$MONO_PREFIX/bin/mono
 
 export MONO_PATH=$MONO_PREFIX/lib/mono/2.0
 export MONO_CFG_DIR=$MONO_PREFIX/etc
-
+export LD_LIBRARY_PATH=$MONO_PREFIX/lib

add_to_build_results/monodistribution/lib/patch_dylibs_to_be_relocatable

+for myfile in `ls *.dylib`;
+  do for i in `otool -L $myfile | egrep -o \/Library\/Frameworks\/Mono.framework\/Versions\/2.6.7\/lib\/.*\.dylib | awk -F/ '{ print $8 }'`;
+	do install_name_tool -change /Library/Frameworks/Mono.framework/Versions/2.6.7/lib/$i @executable_path/../lib/$i $myfile
+  done
+done

build_runtime_android.sh

@@ -32,8 +32,8 @@ case "$HOST_ENV" in
 		;;
 esac
 
-PLATFORM_ROOT=$NDK_ROOT/build/platforms/$ANDROID_PLATFORM/arch-arm
-TOOLCHAIN=$NDK_ROOT/build/prebuilt/$HOST_ENV/arm-eabi-$GCC_VERSION
+PLATFORM_ROOT=$NDK_ROOT/platforms/$ANDROID_PLATFORM/arch-arm
+TOOLCHAIN=$NDK_ROOT/toolchains/arm-eabi-$GCC_VERSION/prebuilt/$HOST_ENV
 
 if [ ! -a $TOOLCHAIN -o ! -a $PLATFORM_ROOT ]; then
 	NDK_NAME=`basename $NDK_ROOT`