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

am 5eff9966: Merge change 26893 into eclair

Browse Source 
Merge commit '5eff99663c35031975b33e25ab74e2a710231c0a' into eclair-plus-aosp

* commit '5eff99663c35031975b33e25ab74e2a710231c0a':
  Make archquery use the same VM as DDMS/Traceview
This commit is contained in:
Xavier Ducrohet
2009-09-24 14:16:32 -07:00
committed by Android Git Automerger
parent 07324ef191 5eff99663c
commit 3d2fbef573
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/ddms/app/etc/ddms
View File

@@ -62,22 +62,16 @@ else
java_debug= java_debug=
fi fi
javaCmd="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 jarpath="$frameworkdir/$jarfile"
jarpath=`cygpath -w "$frameworkdir/$jarfile"`
progdir=`cygpath -w "$progdir"`
else
jarpath="$frameworkdir/$jarfile"
fi
# Figure out the path to the swt.jar for the current architecture. # Figure out the path to the swt.jar for the current architecture.
# if ANDROID_SWT is defined, then just use this. # if ANDROID_SWT is defined, then just use this.
@@ -87,7 +81,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=`${javaCmd} -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"
@@ -107,4 +101,4 @@ fi
# need to use "java.ext.dirs" because "-jar" causes classpath to be ignored # need to use "java.ext.dirs" because "-jar" causes classpath to be ignored
# might need more memory, e.g. -Xmx128M # might need more memory, e.g. -Xmx128M
exec "$java_cmd" -Xmx256M $os_opts $java_debug -Djava.ext.dirs="$frameworkdir" -Dcom.android.ddms.bindir="$progdir" -jar "$jarpath" "$@" exec "$javaCmd" -Xmx256M $os_opts $java_debug -Djava.ext.dirs="$frameworkdir" -Dcom.android.ddms.bindir="$progdir" -jar "$jarpath" "$@"

15
tools/traceview/etc/traceview
View File

@@ -75,13 +75,13 @@ then
exit 1 exit 1
fi fi
javaCmd="java"
os=`uname` os=`uname`
if [ $os == 'Darwin' ]; then if [ $os == 'Darwin' ]; then
javaOpts="-Xmx1600M -XstartOnFirstThread" javaOpts="-Xmx1600M -XstartOnFirstThread"
javaCmd="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Commands/java"
else else
javaOpts="-Xmx1600M" javaOpts="-Xmx1600M"
javaCmd="java"
fi fi
while expr "x$1" : 'x-J' >/dev/null; do while expr "x$1" : 'x-J' >/dev/null; do
@@ -90,12 +90,7 @@ while expr "x$1" : 'x-J' >/dev/null; do
shift shift
done done
if [ "$OSTYPE" = "cygwin" ] ; then jarpath="$frameworkdir/$jarfile"
jarpath=`cygpath -w "$frameworkdir/$jarfile"`
progdir=`cygpath -w "$progdir"`
else
jarpath="$frameworkdir/$jarfile"
fi
# Figure out the path to the swt.jar for the current architecture. # Figure out the path to the swt.jar for the current architecture.
# if ANDROID_SWT is defined, then just use this. # if ANDROID_SWT is defined, then just use this.
@@ -105,7 +100,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=`${javaCmd} -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"
@@ -123,4 +118,4 @@ else
exit 1 exit 1
fi fi
exec "$javaCmd" $javaOpts -Djava.ext.dirs="$frameworkdir" -jar "$jarpath" "$@" exec "${javaCmd}" $javaOpts -Djava.ext.dirs="$frameworkdir" -jar "$jarpath" "$@"