Merge "DO NOT MERGE: Merge Oreo MR1 into master"
diff --git a/tools/lib/animal-sniffer-annotations-1.14.jar b/tools/lib/animal-sniffer-annotations-1.14.jar
new file mode 100644
index 0000000..fb76acf
--- /dev/null
+++ b/tools/lib/animal-sniffer-annotations-1.14.jar
Binary files differ
diff --git a/tools/lib/annotations.jar b/tools/lib/annotations.jar
index 56c0b3e..69d9b0f 100644
--- a/tools/lib/annotations.jar
+++ b/tools/lib/annotations.jar
Binary files differ
diff --git a/tools/lib/ddmlib-26.0.0.jar b/tools/lib/ddmlib-26.0.0.jar
new file mode 100644
index 0000000..8217487
--- /dev/null
+++ b/tools/lib/ddmlib-26.0.0.jar
Binary files differ
diff --git a/tools/lib/error_prone_annotations-2.0.18.jar b/tools/lib/error_prone_annotations-2.0.18.jar
new file mode 100644
index 0000000..fa549b4
--- /dev/null
+++ b/tools/lib/error_prone_annotations-2.0.18.jar
Binary files differ
diff --git a/tools/lib/guava-22.0.jar b/tools/lib/guava-22.0.jar
new file mode 100644
index 0000000..fc7f316
--- /dev/null
+++ b/tools/lib/guava-22.0.jar
Binary files differ
diff --git a/tools/lib/j2objc-annotations-1.1.jar b/tools/lib/j2objc-annotations-1.1.jar
new file mode 100644
index 0000000..4b6f127
--- /dev/null
+++ b/tools/lib/j2objc-annotations-1.1.jar
Binary files differ
diff --git a/tools/lib/jsr305-1.3.9.jar b/tools/lib/jsr305-1.3.9.jar
new file mode 100644
index 0000000..a9afc66
--- /dev/null
+++ b/tools/lib/jsr305-1.3.9.jar
Binary files differ
diff --git a/tools/lib/screenshot2.jar b/tools/lib/screenshot2.jar
index e3e2c2d..006a5e1 100644
--- a/tools/lib/screenshot2.jar
+++ b/tools/lib/screenshot2.jar
Binary files differ
diff --git a/tools/screenshot2 b/tools/screenshot2
index 10b921a..695943c 100755
--- a/tools/screenshot2
+++ b/tools/screenshot2
@@ -69,6 +69,5 @@
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" "$@"
+exec java -Xmx128M $os_opts $java_debug -Dcom.android.screenshot.bindir="$progdir" -jar "$jarpath" "$@"
