diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-29 15:28:07 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-29 15:28:07 -0400 |
| commit | 275de810e99814cefd11321fd934bda1a4b53cc9 (patch) | |
| tree | 5669777ee414df7f70a193a84333467683d772d8 /tools | |
| parent | aa95bfe2ace8940d6ab3ea5f17c733addfba2e53 (diff) | |
| parent | 7bb72933c52d7ece92b07b2d78c6a43ad0c1439e (diff) | |
| download | android_development-275de810e99814cefd11321fd934bda1a4b53cc9.tar.gz android_development-275de810e99814cefd11321fd934bda1a4b53cc9.tar.bz2 android_development-275de810e99814cefd11321fd934bda1a4b53cc9.zip | |
Merge change I2089d86d into eclair-sdk
* changes:
Fix the android launcher script to not force Java 1.5 on MacOS
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/sdkmanager/app/etc/android | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/sdkmanager/app/etc/android b/tools/sdkmanager/app/etc/android index 6a2e961b5..75c9485b2 100755 --- a/tools/sdkmanager/app/etc/android +++ b/tools/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" |