Merge branch 'master' of git.malloc.io:j3g/osxenv

This commit is contained in:
JohnE 2015-04-25 00:00:21 -07:00
commit 90b45ab2e9
1 changed files with 2 additions and 2 deletions

View File

@ -2,8 +2,8 @@
# set the path to android executables # set the path to android executables
# #
ANDROID_SDK_HOME='/Applications/android-dev/android-sdk-macosx' ANDROID_SDK_HOME='/Applications/android-dev/android-sdk'
ANDROID_NDK='/Applications/android-dev/android-ndk-r10d' ANDROID_NDK='/Applications/android-dev/android-ndk'
JAVA_HOME='/usr/local/bin/javahome' JAVA_HOME='/usr/local/bin/javahome'
ANT_HOME=' /usr/local/Cellar/ant/1.9.4' ANT_HOME=' /usr/local/Cellar/ant/1.9.4'
# ln -s /Library/Java/JavaVirtualMachines/1.7.0.jdk/Contents/Home /usr/local/bin/javahome # ln -s /Library/Java/JavaVirtualMachines/1.7.0.jdk/Contents/Home /usr/local/bin/javahome