Add version 25.0.2 of dx.jar to sdk/build-tools.
byte_buddy uses an older version of dx code when running on Android.
Bug: 638318
Change-Id: I0a609850adb4173809b8d82e3390eebb4a3e62d6
Reviewed-on: https://chromium-review.googlesource.com/1083822
Reviewed-by: agrieve <agrieve@chromium.org>
diff --git a/README.chromium b/README.chromium
index 3f76669..c1a3b65 100644
--- a/README.chromium
+++ b/README.chromium
@@ -27,5 +27,7 @@
- Included the Android support library and required extras packages.
- Removed unused resources from the support library (see crbug.com/372481)
- Added extras/chromium/.
+- Cherry-picked build-tools/25.0.2/lib/dx.jar for byte_buddy, which
+ is used by mockito.
No other modifications has been made to the public Android SDK/NDK.
diff --git a/sdk/build-tools/25.0.2/lib/dx.jar b/sdk/build-tools/25.0.2/lib/dx.jar
new file mode 100644
index 0000000..c34d10d
--- /dev/null
+++ b/sdk/build-tools/25.0.2/lib/dx.jar
Binary files differ
