diff options
| author | Siva Velusamy <vsiva@google.com> | 2012-12-04 12:28:37 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-04 12:28:37 -0800 |
| commit | 747b739d2fddbce6e9483371c6778b7ddd17ecf9 (patch) | |
| tree | d55813cb3b7e0424a11144860ca54f01a7eb7b93 | |
| parent | a039cb0661fd589c81ec8b3caccdb02d6f241994 (diff) | |
| parent | 94126d81cce09e5874980bb3b9fd509316d36261 (diff) | |
| download | sdk-747b739d2fddbce6e9483371c6778b7ddd17ecf9.zip sdk-747b739d2fddbce6e9483371c6778b7ddd17ecf9.tar.gz sdk-747b739d2fddbce6e9483371c6778b7ddd17ecf9.tar.bz2 | |
Merge "Suggest using monitor only if it is available."
| -rwxr-xr-x | ddms/app/etc/ddms | 6 | ||||
| -rwxr-xr-x | hierarchyviewer2/app/etc/hierarchyviewer | 6 | ||||
| -rwxr-xr-x | traceview/etc/traceview | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/ddms/app/etc/ddms b/ddms/app/etc/ddms index 165c3ef..79b93f9 100755 --- a/ddms/app/etc/ddms +++ b/ddms/app/etc/ddms @@ -100,8 +100,10 @@ if [ ! -d "$swtpath" ]; then exit 1 fi -echo "The standalone version of DDMS is deprecated." -echo "Please use Android Device Monitor (tools/monitor) instead." +if [ -x $progdir/monitor ]; then + echo "The standalone version of DDMS is deprecated." + echo "Please use Android Device Monitor (tools/monitor) instead." +fi exec "$javaCmd" \ -Xmx256M $os_opts $java_debug \ -Dcom.android.ddms.bindir="$progdir" \ diff --git a/hierarchyviewer2/app/etc/hierarchyviewer b/hierarchyviewer2/app/etc/hierarchyviewer index 7ed10e0..a0cc5f9 100755 --- a/hierarchyviewer2/app/etc/hierarchyviewer +++ b/hierarchyviewer2/app/etc/hierarchyviewer @@ -101,10 +101,12 @@ if [ ! -d "$swtpath" ]; then exit 1 fi +if [ -x $progdir/monitor ]; then + echo "The standalone version of hieararchyviewer is deprecated." + echo "Please use Android Device Monitor (tools/monitor) instead." +fi # need to use "java.ext.dirs" because "-jar" causes classpath to be ignored # might need more memory, e.g. -Xmx128M -echo "The standalone version of hieararchyviewer is deprecated." -echo "Please use Android Device Monitor (tools/monitor) instead." exec "$javaCmd" \ -Xmx512M $os_opts $java_debug \ -Dcom.android.hierarchyviewer.bindir="$progdir" \ diff --git a/traceview/etc/traceview b/traceview/etc/traceview index bf0bd3b..cd4a25f 100755 --- a/traceview/etc/traceview +++ b/traceview/etc/traceview @@ -101,6 +101,8 @@ else exit 1 fi -echo "The standalone version of traceview is deprecated." -echo "Please use Android Device Monitor (tools/monitor) instead." +if [ -x $progdir/monitor ]; then + echo "The standalone version of traceview is deprecated." + echo "Please use Android Device Monitor (tools/monitor) instead." +fi exec "${javaCmd}" $javaOpts -Djava.ext.dirs="$frameworkdir" -Dcom.android.traceview.toolsdir="$progdir" -jar "$jarpath" "$@" |