Sync jb-mr2 prebuilts to be the same as AOSP and master DO NOT MERGE
Change-Id: I046b711e65c18278f40ac3bdcf61ba4a5a6e6a57
diff --git a/tools/android.bat b/tools/android.bat
index f6cfa00..2a34cd8 100755
--- a/tools/android.bat
+++ b/tools/android.bat
@@ -58,7 +58,7 @@
copy /B /D /Y lib\httpcore* %tmp_dir%\lib\ > nul
copy /B /D /Y lib\httpmime* %tmp_dir%\lib\ > nul
copy /B /D /Y lib\layoutlib-api.jar %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\org.eclipse.* %tmp_dir%\lib\ > nul
+ copy /B /D /Y lib\org-eclipse-* %tmp_dir%\lib\ > nul
copy /B /D /Y lib\sdk* %tmp_dir%\lib\ > nul
copy /B /D /Y lib\swtmenubar.jar %tmp_dir%\lib\ > nul
diff --git a/tools/lib/ant-tasks.jar b/tools/lib/ant-tasks.jar
index 4f47222..087118d 100644
--- a/tools/lib/ant-tasks.jar
+++ b/tools/lib/ant-tasks.jar
Binary files differ
diff --git a/tools/lib/archquery.jar b/tools/lib/archquery.jar
index 62dd897..5e89078 100644
--- a/tools/lib/archquery.jar
+++ b/tools/lib/archquery.jar
Binary files differ
diff --git a/tools/lib/asset-studio.jar b/tools/lib/asset-studio.jar
index 2b6f8a1..7efebb9 100644
--- a/tools/lib/asset-studio.jar
+++ b/tools/lib/asset-studio.jar
Binary files differ
diff --git a/tools/lib/chimpchat.jar b/tools/lib/chimpchat.jar
index ff24e28..38b96a7 100644
--- a/tools/lib/chimpchat.jar
+++ b/tools/lib/chimpchat.jar
Binary files differ
diff --git a/tools/lib/common.jar b/tools/lib/common.jar
index f489151..7d4adb8 100644
--- a/tools/lib/common.jar
+++ b/tools/lib/common.jar
Binary files differ
diff --git a/tools/lib/ddmlib.jar b/tools/lib/ddmlib.jar
index 2419b40..5b9e8bb 100644
--- a/tools/lib/ddmlib.jar
+++ b/tools/lib/ddmlib.jar
Binary files differ
diff --git a/tools/lib/ddms.jar b/tools/lib/ddms.jar
index 749ce8e..cf74d53 100644
--- a/tools/lib/ddms.jar
+++ b/tools/lib/ddms.jar
Binary files differ
diff --git a/tools/lib/ddmuilib.jar b/tools/lib/ddmuilib.jar
index 2429d5a..1339ec6 100644
--- a/tools/lib/ddmuilib.jar
+++ b/tools/lib/ddmuilib.jar
Binary files differ
diff --git a/tools/lib/draw9patch.jar b/tools/lib/draw9patch.jar
index 8a9b7c4..da43437 100644
--- a/tools/lib/draw9patch.jar
+++ b/tools/lib/draw9patch.jar
Binary files differ
diff --git a/tools/lib/dvlib.jar b/tools/lib/dvlib.jar
index d890366..85ec226 100644
--- a/tools/lib/dvlib.jar
+++ b/tools/lib/dvlib.jar
Binary files differ
diff --git a/tools/lib/fat32lib.jar b/tools/lib/fat32lib.jar
index edc85c8..92e1cae 100644
--- a/tools/lib/fat32lib.jar
+++ b/tools/lib/fat32lib.jar
Binary files differ
diff --git a/tools/lib/hierarchyviewer2.jar b/tools/lib/hierarchyviewer2.jar
index 4c6074a..adab41f 100644
--- a/tools/lib/hierarchyviewer2.jar
+++ b/tools/lib/hierarchyviewer2.jar
Binary files differ
diff --git a/tools/lib/hierarchyviewer2lib.jar b/tools/lib/hierarchyviewer2lib.jar
index 1115f7b..286c60a 100644
--- a/tools/lib/hierarchyviewer2lib.jar
+++ b/tools/lib/hierarchyviewer2lib.jar
Binary files differ
diff --git a/tools/lib/jobb.jar b/tools/lib/jobb.jar
index b740562..303919a 100644
--- a/tools/lib/jobb.jar
+++ b/tools/lib/jobb.jar
Binary files differ
diff --git a/tools/lib/layoutlib-api.jar b/tools/lib/layoutlib-api.jar
index c905ac0..6f8987d 100644
--- a/tools/lib/layoutlib-api.jar
+++ b/tools/lib/layoutlib-api.jar
Binary files differ
diff --git a/tools/lib/lint-api.jar b/tools/lib/lint-api.jar
index e5a4cbb..8b3ee5d 100644
--- a/tools/lib/lint-api.jar
+++ b/tools/lib/lint-api.jar
Binary files differ
diff --git a/tools/lib/lint-checks.jar b/tools/lib/lint-checks.jar
index b91d3a2..43021c0 100644
--- a/tools/lib/lint-checks.jar
+++ b/tools/lib/lint-checks.jar
Binary files differ
diff --git a/tools/lib/lint.jar b/tools/lib/lint.jar
index af21b2f..ad2014f 100644
--- a/tools/lib/lint.jar
+++ b/tools/lib/lint.jar
Binary files differ
diff --git a/tools/lib/manifest-merger.jar b/tools/lib/manifest-merger.jar
index e3cce5f..e07e33e 100644
--- a/tools/lib/manifest-merger.jar
+++ b/tools/lib/manifest-merger.jar
Binary files differ
diff --git a/tools/lib/monkeyrunner.jar b/tools/lib/monkeyrunner.jar
index 5655a67..66fb59f 100644
--- a/tools/lib/monkeyrunner.jar
+++ b/tools/lib/monkeyrunner.jar
Binary files differ
diff --git a/tools/lib/ninepatch.jar b/tools/lib/ninepatch.jar
index ead4f7d..c0e7687 100644
--- a/tools/lib/ninepatch.jar
+++ b/tools/lib/ninepatch.jar
Binary files differ
diff --git a/tools/lib/rule-api.jar b/tools/lib/rule-api.jar
index 646071e..f31b4d2 100644
--- a/tools/lib/rule-api.jar
+++ b/tools/lib/rule-api.jar
Binary files differ
diff --git a/tools/lib/screenshot2.jar b/tools/lib/screenshot2.jar
new file mode 100644
index 0000000..40596f8
--- /dev/null
+++ b/tools/lib/screenshot2.jar
Binary files differ
diff --git a/tools/lib/sdk-common.jar b/tools/lib/sdk-common.jar
index f103e95..c33414b 100644
--- a/tools/lib/sdk-common.jar
+++ b/tools/lib/sdk-common.jar
Binary files differ
diff --git a/tools/lib/sdklib.jar b/tools/lib/sdklib.jar
index 5013c8c..b6b46f1 100644
--- a/tools/lib/sdklib.jar
+++ b/tools/lib/sdklib.jar
Binary files differ
diff --git a/tools/lib/sdkmanager.jar b/tools/lib/sdkmanager.jar
index 64c702b..5c2afbd 100644
--- a/tools/lib/sdkmanager.jar
+++ b/tools/lib/sdkmanager.jar
Binary files differ
diff --git a/tools/lib/sdkstats.jar b/tools/lib/sdkstats.jar
index 1d89fd7..2f5a814 100644
--- a/tools/lib/sdkstats.jar
+++ b/tools/lib/sdkstats.jar
Binary files differ
diff --git a/tools/lib/sdkuilib.jar b/tools/lib/sdkuilib.jar
index 5a7301b..bc92365 100644
--- a/tools/lib/sdkuilib.jar
+++ b/tools/lib/sdkuilib.jar
Binary files differ
diff --git a/tools/lib/swtmenubar.jar b/tools/lib/swtmenubar.jar
index ae3eaa6..6e7f81e 100644
--- a/tools/lib/swtmenubar.jar
+++ b/tools/lib/swtmenubar.jar
Binary files differ
diff --git a/tools/lib/traceview.jar b/tools/lib/traceview.jar
index 5de7efc..bd8f340 100644
--- a/tools/lib/traceview.jar
+++ b/tools/lib/traceview.jar
Binary files differ
diff --git a/tools/lib/uiautomatorviewer.jar b/tools/lib/uiautomatorviewer.jar
index be53e73..8e2e079 100644
--- a/tools/lib/uiautomatorviewer.jar
+++ b/tools/lib/uiautomatorviewer.jar
Binary files 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" "$@"
