From 0c6521cdbb151d250079a63c5c870cb9d157fa66 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Wed, 17 Apr 2013 17:20:54 -0700
Subject: Update SDK prebuilts.

Origin:
tools/base: @ 32a6b95bf32fd4b198c3a36b8204a019cc075ad7
tools/swt: @ a2312c9e59568737bab4d1d0b5e03a57dc0dac11

Change-Id: I9d293955a79c1f92ede2d177bc4bad665160f8cc
---
 tools/lib/ant-tasks.jar           | Bin 101716 -> 101715 bytes
 tools/lib/chimpchat.jar           | Bin 51410 -> 51409 bytes
 tools/lib/common.jar              | Bin 54945 -> 54945 bytes
 tools/lib/ddms.jar                | Bin 123764 -> 123763 bytes
 tools/lib/hierarchyviewer2.jar    | Bin 32575 -> 32575 bytes
 tools/lib/hierarchyviewer2lib.jar | Bin 371369 -> 371371 bytes
 tools/lib/monkeyrunner.jar        | Bin 101632 -> 101632 bytes
 tools/lib/screenshot2.jar         | Bin 0 -> 5379 bytes
 tools/lib/sdk-common.jar          | Bin 215588 -> 215597 bytes
 tools/lib/sdklib.jar              | Bin 567963 -> 567954 bytes
 tools/lib/sdkmanager.jar          | Bin 26741 -> 26741 bytes
 tools/lib/sdkstats.jar            | Bin 16838 -> 16838 bytes
 tools/lib/sdkuilib.jar            | Bin 438877 -> 438862 bytes
 tools/lib/swtmenubar.jar          | Bin 18576 -> 18579 bytes
 tools/lib/traceview.jar           | Bin 137239 -> 137238 bytes
 tools/lib/uiautomatorviewer.jar   | Bin 51636 -> 51636 bytes
 tools/screenshot2                 |  74 ++++++++++++++++++++++++++++++++++++++
 17 files changed, 74 insertions(+)
 create mode 100644 tools/lib/screenshot2.jar
 create mode 100755 tools/screenshot2

(limited to 'tools')

diff --git a/tools/lib/ant-tasks.jar b/tools/lib/ant-tasks.jar
index 9c8d0c8..6a67c70 100644
Binary files a/tools/lib/ant-tasks.jar and b/tools/lib/ant-tasks.jar differ
diff --git a/tools/lib/chimpchat.jar b/tools/lib/chimpchat.jar
index ff24e28..c8e1df8 100644
Binary files a/tools/lib/chimpchat.jar and b/tools/lib/chimpchat.jar differ
diff --git a/tools/lib/common.jar b/tools/lib/common.jar
index 9708e1e..143e11a 100644
Binary files a/tools/lib/common.jar and b/tools/lib/common.jar differ
diff --git a/tools/lib/ddms.jar b/tools/lib/ddms.jar
index 749ce8e..2aa1c98 100644
Binary files a/tools/lib/ddms.jar and b/tools/lib/ddms.jar differ
diff --git a/tools/lib/hierarchyviewer2.jar b/tools/lib/hierarchyviewer2.jar
index 4c6074a..bf7e018 100644
Binary files a/tools/lib/hierarchyviewer2.jar and b/tools/lib/hierarchyviewer2.jar differ
diff --git a/tools/lib/hierarchyviewer2lib.jar b/tools/lib/hierarchyviewer2lib.jar
index 1115f7b..a194647 100644
Binary files a/tools/lib/hierarchyviewer2lib.jar and b/tools/lib/hierarchyviewer2lib.jar differ
diff --git a/tools/lib/monkeyrunner.jar b/tools/lib/monkeyrunner.jar
index 5655a67..f4a7a18 100644
Binary files a/tools/lib/monkeyrunner.jar and b/tools/lib/monkeyrunner.jar differ
diff --git a/tools/lib/screenshot2.jar b/tools/lib/screenshot2.jar
new file mode 100644
index 0000000..0f7369c
Binary files /dev/null and b/tools/lib/screenshot2.jar differ
diff --git a/tools/lib/sdk-common.jar b/tools/lib/sdk-common.jar
index 31ec1b5..8bb1c4e 100644
Binary files a/tools/lib/sdk-common.jar and b/tools/lib/sdk-common.jar differ
diff --git a/tools/lib/sdklib.jar b/tools/lib/sdklib.jar
index d6c3cdc..d0889fc 100644
Binary files a/tools/lib/sdklib.jar and b/tools/lib/sdklib.jar differ
diff --git a/tools/lib/sdkmanager.jar b/tools/lib/sdkmanager.jar
index df7c5ca..7c86294 100644
Binary files a/tools/lib/sdkmanager.jar and b/tools/lib/sdkmanager.jar differ
diff --git a/tools/lib/sdkstats.jar b/tools/lib/sdkstats.jar
index 1d89fd7..5d3bd57 100644
Binary files a/tools/lib/sdkstats.jar and b/tools/lib/sdkstats.jar differ
diff --git a/tools/lib/sdkuilib.jar b/tools/lib/sdkuilib.jar
index 99e39a9..0b53f8b 100644
Binary files a/tools/lib/sdkuilib.jar and b/tools/lib/sdkuilib.jar differ
diff --git a/tools/lib/swtmenubar.jar b/tools/lib/swtmenubar.jar
index ae3eaa6..2604ceb 100644
Binary files a/tools/lib/swtmenubar.jar and b/tools/lib/swtmenubar.jar differ
diff --git a/tools/lib/traceview.jar b/tools/lib/traceview.jar
index 62094f8..e5840a6 100644
Binary files a/tools/lib/traceview.jar and b/tools/lib/traceview.jar differ
diff --git a/tools/lib/uiautomatorviewer.jar b/tools/lib/uiautomatorviewer.jar
index be53e73..6ea337f 100644
Binary files a/tools/lib/uiautomatorviewer.jar and b/tools/lib/uiautomatorviewer.jar differ
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" "$@"
-- 
cgit v1.2.3