Skip to content

Commit

Permalink
Add Apache HTTP libraries to DEPS for Android.
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
[email protected] committed Dec 6, 2012
1 parent 3b31c6a commit fd72f73
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ v8.log
/third_party/angle
/third_party/android_tools/
/third_party/aosp
/third_party/apache-mime4j
/third_party/asan
/third_party/bidichecker
/third_party/bison
Expand All @@ -164,6 +165,7 @@ v8.log
/third_party/cygwin
/third_party/directxsdk
/third_party/drmemory
/third_party/findbugs
/third_party/ffmpeg
/third_party/flac
/third_party/freetype
Expand All @@ -173,9 +175,12 @@ v8.log
/third_party/googlemac
/third_party/gperf
/third_party/guava/src
/third_party/httpcomponents-client
/third_party/httpcomponents-core
/third_party/hunspell
/third_party/hunspell_dictionaries
/third_party/icu
/third_party/jarjar
/third_party/jsoncpp/source
/third_party/jsr-305/src
/third_party/leveldatabase/src
Expand Down
27 changes: 20 additions & 7 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -539,22 +539,35 @@ deps_os = {
"@59dafd34a6eb3b6eee63b59f7cc6cd01e4fda770",
},
"android": {
"src/third_party/freetype":
Var("chromium_git") + "/chromium/src/third_party/freetype.git" +
"@96551feab72aac26836e9aaf4fae0962d39d5ab0",
"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/android_tools":
Var("chromium_git") + "/android_tools.git" +
"@1cef853f682461dbb27a4992d3d8b5bc1f69232b",
"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",
Expand Down

0 comments on commit fd72f73

Please sign in to comment.