[go: nahoru, domu]

Add Apache HTTP libraries to DEPS for Android.

* Adds support for Apache libraries to be able to use multipart in Java
HTTP clients.
* Orders all Android-specific DEPS
* Adds missing third_party/findbugs to .gitignore

Previously landed as r171045, but reverted because git-mirrors were not
ready.

BUG=164257

Review URL: https://codereview.chromium.org/11418318

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171594 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/DEPS b/DEPS
index 8fc8428..b6d9c6e 100644
--- a/DEPS
+++ b/DEPS
@@ -539,22 +539,35 @@
       "@59dafd34a6eb3b6eee63b59f7cc6cd01e4fda770",
   },
   "android": {
-    "src/third_party/freetype":
-      Var("chromium_git") + "/chromium/src/third_party/freetype.git" +
-      "@96551feab72aac26836e9aaf4fae0962d39d5ab0",
-
-    "src/third_party/aosp":
-      "/trunk/deps/third_party/aosp@148330",
-
     "src/third_party/android_tools":
       Var("chromium_git") + "/android_tools.git" +
       "@1cef853f682461dbb27a4992d3d8b5bc1f69232b",
 
+    "src/third_party/aosp":
+      "/trunk/deps/third_party/aosp@148330",
+
+    "src/third_party/apache-mime4j":
+      "/trunk/deps/third_party/apache-mime4j@170888",
+
     "src/third_party/findbugs":
       "/trunk/deps/third_party/findbugs@163586",
 
+    "src/third_party/freetype":
+      Var("chromium_git") + "/chromium/src/third_party/freetype.git" +
+      "@96551feab72aac26836e9aaf4fae0962d39d5ab0",
+
     "src/third_party/guava/src":
-      Var("chromium_git") + '/external/guava-libraries.git@c523556ab7d0f05afadebd20e7768d4c16af8771',
+      Var("chromium_git") + "/external/guava-libraries.git" +
+      "@c523556ab7d0f05afadebd20e7768d4c16af8771",
+
+    "src/third_party/httpcomponents-client":
+      "/trunk/deps/third_party/httpcomponents-client@170888",
+
+    "src/third_party/httpcomponents-core":
+      "/trunk/deps/third_party/httpcomponents-core@170888",
+
+    "src/third_party/jarjar":
+      "/trunk/deps/third_party/jarjar@170888",
 
     "src/third_party/jsr-305/src":
       (Var("googlecode_url") % "jsr-305") + "/trunk@51",