LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 275de810: Merge change I2089d86d into eclair-sdk

Browse Source 
Merge commit '275de810e99814cefd11321fd934bda1a4b53cc9' into eclair

* commit '275de810e99814cefd11321fd934bda1a4b53cc9':
  Fix the android launcher script to not force Java 1.5 on MacOS
This commit is contained in:
Xavier Ducrohet
2009-10-29 12:39:03 -07:00
committed by Android Git Automerger
parent 107b1a9ee6 275de810e9
commit f7f145dc04
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/sdkmanager/app/etc/android
View File

@@ -62,14 +62,13 @@ else
java_debug= java_debug=
fi fi
java_cmd="java"
# Mac OS X needs an additional arg, or you get an "illegal thread" complaint. # Mac OS X needs an additional arg, or you get an "illegal thread" complaint.
if [ `uname` = "Darwin" ]; then if [ `uname` = "Darwin" ]; then
os_opts="-XstartOnFirstThread" 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 else
os_opts= os_opts=
java_cmd="java"
fi fi
if [ "$OSTYPE" = "cygwin" ] ; then if [ "$OSTYPE" = "cygwin" ] ; then
@@ -87,7 +86,7 @@ swtpath=""
if [ -n "$ANDROID_SWT" ]; then if [ -n "$ANDROID_SWT" ]; then
swtpath="$ANDROID_SWT" swtpath="$ANDROID_SWT"
else else
vmarch=`java -jar "${frameworkdir}"/archquery.jar` vmarch=`${java_cmd} -jar "${frameworkdir}"/archquery.jar`
if [ -n "$ANDROID_BUILD_TOP" ]; then if [ -n "$ANDROID_BUILD_TOP" ]; then
osname=`uname -s | tr A-Z a-z` osname=`uname -s | tr A-Z a-z`
swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt" swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt"