diff options
author | Xavier Ducrohet <xav@android.com> | 2013-04-17 17:20:54 -0700 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2013-04-17 17:21:17 -0700 |
commit | 0c6521cdbb151d250079a63c5c870cb9d157fa66 (patch) | |
tree | f9fbfc4d221e17dc3308b08b4199e989063a7542 /tools | |
parent | 536e0fee20bb5c6b2ec9a8d810a5d92e2d5f27c5 (diff) | |
download | devtools-0c6521cdbb151d250079a63c5c870cb9d157fa66.tar.gz |
Update SDK prebuilts.
Origin:
tools/base: @ 32a6b95bf32fd4b198c3a36b8204a019cc075ad7
tools/swt: @ a2312c9e59568737bab4d1d0b5e03a57dc0dac11
Change-Id: I9d293955a79c1f92ede2d177bc4bad665160f8cc
Diffstat (limited to 'tools')
-rw-r--r-- | tools/lib/ant-tasks.jar | bin | 101716 -> 101715 bytes | |||
-rw-r--r-- | tools/lib/chimpchat.jar | bin | 51410 -> 51409 bytes | |||
-rw-r--r-- | tools/lib/common.jar | bin | 54945 -> 54945 bytes | |||
-rw-r--r-- | tools/lib/ddms.jar | bin | 123764 -> 123763 bytes | |||
-rw-r--r-- | tools/lib/hierarchyviewer2.jar | bin | 32575 -> 32575 bytes | |||
-rw-r--r-- | tools/lib/hierarchyviewer2lib.jar | bin | 371369 -> 371371 bytes | |||
-rw-r--r-- | tools/lib/monkeyrunner.jar | bin | 101632 -> 101632 bytes | |||
-rw-r--r-- | tools/lib/screenshot2.jar | bin | 0 -> 5379 bytes | |||
-rw-r--r-- | tools/lib/sdk-common.jar | bin | 215588 -> 215597 bytes | |||
-rw-r--r-- | tools/lib/sdklib.jar | bin | 567963 -> 567954 bytes | |||
-rw-r--r-- | tools/lib/sdkmanager.jar | bin | 26741 -> 26741 bytes | |||
-rw-r--r-- | tools/lib/sdkstats.jar | bin | 16838 -> 16838 bytes | |||
-rw-r--r-- | tools/lib/sdkuilib.jar | bin | 438877 -> 438862 bytes | |||
-rw-r--r-- | tools/lib/swtmenubar.jar | bin | 18576 -> 18579 bytes | |||
-rw-r--r-- | tools/lib/traceview.jar | bin | 137239 -> 137238 bytes | |||
-rw-r--r-- | tools/lib/uiautomatorviewer.jar | bin | 51636 -> 51636 bytes | |||
-rwxr-xr-x | tools/screenshot2 | 74 |
17 files changed, 74 insertions, 0 deletions
diff --git a/tools/lib/ant-tasks.jar b/tools/lib/ant-tasks.jar Binary files differindex 9c8d0c8..6a67c70 100644 --- a/tools/lib/ant-tasks.jar +++ b/tools/lib/ant-tasks.jar diff --git a/tools/lib/chimpchat.jar b/tools/lib/chimpchat.jar Binary files differindex ff24e28..c8e1df8 100644 --- a/tools/lib/chimpchat.jar +++ b/tools/lib/chimpchat.jar diff --git a/tools/lib/common.jar b/tools/lib/common.jar Binary files differindex 9708e1e..143e11a 100644 --- a/tools/lib/common.jar +++ b/tools/lib/common.jar diff --git a/tools/lib/ddms.jar b/tools/lib/ddms.jar Binary files differindex 749ce8e..2aa1c98 100644 --- a/tools/lib/ddms.jar +++ b/tools/lib/ddms.jar diff --git a/tools/lib/hierarchyviewer2.jar b/tools/lib/hierarchyviewer2.jar Binary files differindex 4c6074a..bf7e018 100644 --- a/tools/lib/hierarchyviewer2.jar +++ b/tools/lib/hierarchyviewer2.jar diff --git a/tools/lib/hierarchyviewer2lib.jar b/tools/lib/hierarchyviewer2lib.jar Binary files differindex 1115f7b..a194647 100644 --- a/tools/lib/hierarchyviewer2lib.jar +++ b/tools/lib/hierarchyviewer2lib.jar diff --git a/tools/lib/monkeyrunner.jar b/tools/lib/monkeyrunner.jar Binary files differindex 5655a67..f4a7a18 100644 --- a/tools/lib/monkeyrunner.jar +++ b/tools/lib/monkeyrunner.jar diff --git a/tools/lib/screenshot2.jar b/tools/lib/screenshot2.jar Binary files differnew file mode 100644 index 0000000..0f7369c --- /dev/null +++ b/tools/lib/screenshot2.jar diff --git a/tools/lib/sdk-common.jar b/tools/lib/sdk-common.jar Binary files differindex 31ec1b5..8bb1c4e 100644 --- a/tools/lib/sdk-common.jar +++ b/tools/lib/sdk-common.jar diff --git a/tools/lib/sdklib.jar b/tools/lib/sdklib.jar Binary files differindex d6c3cdc..d0889fc 100644 --- a/tools/lib/sdklib.jar +++ b/tools/lib/sdklib.jar diff --git a/tools/lib/sdkmanager.jar b/tools/lib/sdkmanager.jar Binary files differindex df7c5ca..7c86294 100644 --- a/tools/lib/sdkmanager.jar +++ b/tools/lib/sdkmanager.jar diff --git a/tools/lib/sdkstats.jar b/tools/lib/sdkstats.jar Binary files differindex 1d89fd7..5d3bd57 100644 --- a/tools/lib/sdkstats.jar +++ b/tools/lib/sdkstats.jar diff --git a/tools/lib/sdkuilib.jar b/tools/lib/sdkuilib.jar Binary files differindex 99e39a9..0b53f8b 100644 --- a/tools/lib/sdkuilib.jar +++ b/tools/lib/sdkuilib.jar diff --git a/tools/lib/swtmenubar.jar b/tools/lib/swtmenubar.jar Binary files differindex ae3eaa6..2604ceb 100644 --- a/tools/lib/swtmenubar.jar +++ b/tools/lib/swtmenubar.jar diff --git a/tools/lib/traceview.jar b/tools/lib/traceview.jar Binary files differindex 62094f8..e5840a6 100644 --- a/tools/lib/traceview.jar +++ b/tools/lib/traceview.jar diff --git a/tools/lib/uiautomatorviewer.jar b/tools/lib/uiautomatorviewer.jar Binary files differindex be53e73..6ea337f 100644 --- a/tools/lib/uiautomatorviewer.jar +++ b/tools/lib/uiautomatorviewer.jar diff --git a/tools/screenshot2 b/tools/screenshot2 new file mode 100755 index 0000000..10b921a --- /dev/null +++ b/tools/screenshot2 @@ -0,0 +1,74 @@ +#!/bin/sh +# Copyright 2005-2007, The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Set up prog to be the path of this script, including following symlinks, +# and set up progdir to be the fully-qualified pathname of its directory. +prog="$0" +while [ -h "${prog}" ]; do + newProg=`/bin/ls -ld "${prog}"` + newProg=`expr "${newProg}" : ".* -> \(.*\)$"` + if expr "x${newProg}" : 'x/' >/dev/null; then + prog="${newProg}" + else + progdir=`dirname "${prog}"` + prog="${progdir}/${newProg}" + fi +done +oldwd=`pwd` +progdir=`dirname "${prog}"` +cd "${progdir}" +progdir=`pwd` +prog="${progdir}"/`basename "${prog}"` +cd "${oldwd}" + +jarfile=screenshot2.jar +frameworkdir="$progdir" +libdir="$progdir" +if [ ! -r "$frameworkdir/$jarfile" ] +then + frameworkdir=`dirname "$progdir"`/tools/lib + libdir=`dirname "$progdir"`/tools/lib +fi +if [ ! -r "$frameworkdir/$jarfile" ] +then + frameworkdir=`dirname "$progdir"`/framework + libdir=`dirname "$progdir"`/lib +fi +if [ ! -r "$frameworkdir/$jarfile" ] +then + echo `basename "$prog"`": can't find $jarfile" + exit 1 +fi + + +# Check args. +if [ debug = "$1" ]; then + # add this in for debugging + java_debug=-agentlib:jdwp=transport=dt_socket,server=y,address=8050,suspend=y + shift 1 +else + java_debug= +fi + +if [ "$OSTYPE" = "cygwin" ] ; then + jarpath=`cygpath -w "$frameworkdir/$jarfile"` + progdir=`cygpath -w "$progdir"` +else + jarpath="$frameworkdir/$jarfile" +fi + +# need to use "java.ext.dirs" because "-jar" causes classpath to be ignored +# might need more memory, e.g. -Xmx128M +exec java -Xmx128M $os_opts $java_debug -Djava.ext.dirs="$frameworkdir" -Djava.library.path="$libdir" -Dcom.android.screenshot.bindir="$progdir" -jar "$jarpath" "$@" |