diff options
| author | Xavier Ducrohet <xav@android.com> | 2009-10-29 11:40:20 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2009-10-29 12:15:02 -0700 |
| commit | 94bd158ca4e08784040683ed20dfb475395cb522 (patch) | |
| tree | 1036f19756ba371118ccb485fdc54facf5b9a396 | |
| parent | d9df9a3176187ced0b33af2301a1f80ec2d126b2 (diff) | |
| download | sdk-94bd158ca4e08784040683ed20dfb475395cb522.zip sdk-94bd158ca4e08784040683ed20dfb475395cb522.tar.gz sdk-94bd158ca4e08784040683ed20dfb475395cb522.tar.bz2 | |
Fix the android launcher script to not force Java 1.5 on MacOS
| -rwxr-xr-x | sdkmanager/app/etc/android | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sdkmanager/app/etc/android b/sdkmanager/app/etc/android index 6a2e961..75c9485 100755 --- a/sdkmanager/app/etc/android +++ b/sdkmanager/app/etc/android @@ -62,14 +62,13 @@ else java_debug= fi +java_cmd="java" + # Mac OS X needs an additional arg, or you get an "illegal thread" complaint. if [ `uname` = "Darwin" ]; then os_opts="-XstartOnFirstThread" - #because Java 1.6 is 64 bits only and SWT doesn't support this, we force the usage of java 1.5 - java_cmd="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Commands/java" else os_opts= - java_cmd="java" fi if [ "$OSTYPE" = "cygwin" ] ; then @@ -87,7 +86,7 @@ swtpath="" if [ -n "$ANDROID_SWT" ]; then swtpath="$ANDROID_SWT" else - vmarch=`java -jar "${frameworkdir}"/archquery.jar` + vmarch=`${java_cmd} -jar "${frameworkdir}"/archquery.jar` if [ -n "$ANDROID_BUILD_TOP" ]; then osname=`uname -s | tr A-Z a-z` swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt" |