diff --git a/.gitignore b/.gitignore index dbe7ae5c93c46f..47ec021b1afb7a 100644 --- a/.gitignore +++ b/.gitignore @@ -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 @@ -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 @@ -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 diff --git a/DEPS b/DEPS index 8fc8428e9343c5..b6d9c6e3da6a91 100644 --- a/DEPS +++ b/DEPS @@ -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",