diff options
author | Xin Li <delphij@google.com> | 2017-12-06 23:18:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-06 23:18:28 +0000 |
commit | b6d577870004cdb6b921118384d3b5a63c4a27d4 (patch) | |
tree | 324ffb725ee29414eff80b92e899f6f2d4de5d50 | |
parent | 27cd9cbeb92cba1b3ead834e5a8167d57c822b62 (diff) | |
parent | 2aba384dcb0808ab756eafad57334132668bd6f1 (diff) | |
download | devtools-b6d577870004cdb6b921118384d3b5a63c4a27d4.tar.gz |
Merge "DO NOT MERGE: Merge Oreo MR1 into master"android-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
-rw-r--r-- | tools/lib/animal-sniffer-annotations-1.14.jar | bin | 0 -> 3482 bytes | |||
-rw-r--r-- | tools/lib/annotations.jar | bin | 4229 -> 4229 bytes | |||
-rw-r--r-- | tools/lib/ddmlib-26.0.0.jar | bin | 0 -> 325972 bytes | |||
-rw-r--r-- | tools/lib/error_prone_annotations-2.0.18.jar | bin | 0 -> 12078 bytes | |||
-rw-r--r-- | tools/lib/guava-22.0.jar | bin | 0 -> 2575022 bytes | |||
-rw-r--r-- | tools/lib/j2objc-annotations-1.1.jar | bin | 0 -> 8782 bytes | |||
-rw-r--r-- | tools/lib/jsr305-1.3.9.jar | bin | 0 -> 33015 bytes | |||
-rw-r--r-- | tools/lib/screenshot2.jar | bin | 5389 -> 11622 bytes | |||
-rwxr-xr-x | tools/screenshot2 | 3 |
9 files changed, 1 insertions, 2 deletions
diff --git a/tools/lib/animal-sniffer-annotations-1.14.jar b/tools/lib/animal-sniffer-annotations-1.14.jar Binary files differnew file mode 100644 index 0000000..fb76acf --- /dev/null +++ b/tools/lib/animal-sniffer-annotations-1.14.jar diff --git a/tools/lib/annotations.jar b/tools/lib/annotations.jar Binary files differindex 56c0b3e..69d9b0f 100644 --- a/tools/lib/annotations.jar +++ b/tools/lib/annotations.jar diff --git a/tools/lib/ddmlib-26.0.0.jar b/tools/lib/ddmlib-26.0.0.jar Binary files differnew file mode 100644 index 0000000..8217487 --- /dev/null +++ b/tools/lib/ddmlib-26.0.0.jar diff --git a/tools/lib/error_prone_annotations-2.0.18.jar b/tools/lib/error_prone_annotations-2.0.18.jar Binary files differnew file mode 100644 index 0000000..fa549b4 --- /dev/null +++ b/tools/lib/error_prone_annotations-2.0.18.jar diff --git a/tools/lib/guava-22.0.jar b/tools/lib/guava-22.0.jar Binary files differnew file mode 100644 index 0000000..fc7f316 --- /dev/null +++ b/tools/lib/guava-22.0.jar diff --git a/tools/lib/j2objc-annotations-1.1.jar b/tools/lib/j2objc-annotations-1.1.jar Binary files differnew file mode 100644 index 0000000..4b6f127 --- /dev/null +++ b/tools/lib/j2objc-annotations-1.1.jar diff --git a/tools/lib/jsr305-1.3.9.jar b/tools/lib/jsr305-1.3.9.jar Binary files differnew file mode 100644 index 0000000..a9afc66 --- /dev/null +++ b/tools/lib/jsr305-1.3.9.jar diff --git a/tools/lib/screenshot2.jar b/tools/lib/screenshot2.jar Binary files differindex e3e2c2d..006a5e1 100644 --- a/tools/lib/screenshot2.jar +++ b/tools/lib/screenshot2.jar diff --git a/tools/screenshot2 b/tools/screenshot2 index 10b921a..695943c 100755 --- a/tools/screenshot2 +++ b/tools/screenshot2 @@ -69,6 +69,5 @@ 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" "$@" +exec java -Xmx128M $os_opts $java_debug -Dcom.android.screenshot.bindir="$progdir" -jar "$jarpath" "$@" |