Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(331)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: DEPS.chromium

Issue 298823004: Roll bleeding_edge to Dartium 35 / 1916. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/deps/dartium.deps/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: DEPS.chromium
===================================================================
--- DEPS.chromium (revision 36406)
+++ DEPS.chromium (working copy)
@@ -19,57 +19,62 @@
"sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
"llvm_url": "http://src.chromium.org/llvm-project",
"llvm_git": "https://llvm.googlesource.com",
- "libcxx_revision": "8f48c23568a122de6088455700e9d197b79bd8f8",
- "libcxxabi_revision": "753a30dd68ae008948d48f16bc942d5963fe65a1",
+ "libcxx_revision": "197314",
+ "libcxxabi_revision": "197063",
"webkit_trunk": "http://src.chromium.org/blink/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "167304",
+ "webkit_revision": "170313",
"chromium_git": "https://chromium.googlesource.com",
"chromiumos_git": "https://chromium.googlesource.com/chromiumos",
"skia_git": "https://skia.googlesource.com",
"swig_revision": "230490",
- "nacl_revision": "12773",
+ "nacl_revision": "12935",
# After changing nacl_revision, run 'glient sync' and check native_client/DEPS
# to update other nacl_*_revision's.
"nacl_tools_revision": "12760", # native_client/DEPS: tools_rev
- "google_toolbox_for_mac_revision": "626",
+ "google_toolbox_for_mac_revision": "662",
"libaddressinput_revision": "176",
"libphonenumber_revision": "621",
- "libvpx_revision": "251850",
+ "libvpx_revision": "259953",
"lss_revision": "24",
# These two FFmpeg variables must be updated together. One is used for SVN
# checkouts and the other for Git checkouts.
- "ffmpeg_revision": "249179",
- "ffmpeg_hash": "4ae5e54f30f949e5485d70fa0eae85a0e75cb46c",
+ "ffmpeg_revision": "255431",
+ "ffmpeg_hash": "681ca6bfed239ad2e1a6a3c8a586839c6dbd3e87",
"sfntly_revision": "228",
"lighttpd_revision": "33737",
- "skia_revision": "13441",
- "skia_hash": "a7692a9ac6cb8a0bbe6bbdfc83f86014a7dc265e",
+ "skia_revision": "13966",
+ "skia_hash": "c94a028ff836f8f0af41ec33ceb1f4bc140841bf",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and V8 without interference from each other.
- "v8_revision": "19215",
+ "v8_branch": "trunk",
+ "v8_revision": "20290",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling WebRTC
# and V8 without interference from each other.
- "webrtc_revision": "5562",
+ "webrtc_revision": "5807",
"jsoncpp_revision": "248",
- "nss_revision": "246067",
+ "nss_revision": "259440",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
# and whatever else without interference from each other.
- "swarming_revision": "5b47578a4c25b1447172c78bcfce8c1fc7a69839",
+ "swarming_revision": "8472efa59518a6e28db6da249685d65f49ce8244",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling openssl
# and whatever else without interference from each other.
- "openssl_revision": "250522",
+ "openssl_revision": "253925",
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling ANGLE
+ # and whatever else without interference from each other.
+ "angle_revision": "740a2f8daa9cc45c53ecf7333c3ae5aa64c821f8",
}
deps = {
"src/breakpad/src":
- (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1271",
+ (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1289",
"src/sdch/open-vcdiff":
(Var("googlecode_url") % "open-vcdiff") + "/trunk@42",
@@ -81,11 +86,10 @@
(Var("googlecode_url") % "googlemock") + "/trunk@410",
"src/third_party/angle":
- Var("chromium_git") +
- "/angle/angle.git@4df02c1ed5e97dd54576b06964b1da67ea30238e",
+ Var("chromium_git") + "/angle/angle.git@" + Var("angle_revision"),
"src/third_party/trace-viewer":
- (Var("googlecode_url") % "trace-viewer") + "/trunk@1133",
+ (Var("googlecode_url") % "trace-viewer") + "/trunk@1212",
"src/third_party/WebKit":
Var("webkit_trunk") + "@" + Var("webkit_revision"),
@@ -99,50 +103,49 @@
"/external/w3c/csswg-test.git@8c415e3215a203fa3a22dbdd1799279fdf44c81e",
"src/third_party/icu":
- "/trunk/deps/third_party/icu46@246118",
+ "/trunk/deps/third_party/icu46@259309",
"src/third_party/libexif/sources":
"/trunk/deps/third_party/libexif/sources@146817",
"src/third_party/hunspell":
- "/trunk/deps/third_party/hunspell@206172",
+ "/trunk/deps/third_party/hunspell@256272",
"src/third_party/hunspell_dictionaries":
- "/trunk/deps/third_party/hunspell_dictionaries@193701",
+ "/trunk/deps/third_party/hunspell_dictionaries@255132",
"src/third_party/safe_browsing/testing":
(Var("googlecode_url") % "google-safe-browsing") + "/trunk/testing@112",
"src/third_party/cacheinvalidation/src":
(Var("googlecode_url") % "google-cache-invalidation-api") +
- "/trunk/src@321",
+ "/trunk/src@330",
"src/third_party/leveldatabase/src":
(Var("googlecode_url") % "leveldb") + "/trunk@79",
- # TODO(thakis): Pull from svn instead, http://crbug.com/333071
"src/third_party/libc++/trunk":
- Var("llvm_git") + "/libcxx.git@" + Var("libcxx_revision"),
+ Var("llvm_url") + "/libcxx/trunk@" + Var("libcxx_revision"),
- # TODO(thakis): Pull from svn instead, http://crbug.com/333071
"src/third_party/libc++abi/trunk":
- Var("llvm_git") + "/libcxxabi.git@" + Var("libcxxabi_revision"),
+ Var("llvm_url") + "/libcxxabi/trunk@" + Var("libcxxabi_revision"),
"src/third_party/snappy/src":
(Var("googlecode_url") % "snappy") + "/trunk@80",
"src/tools/grit":
- (Var("googlecode_url") % "grit-i18n") + "/trunk@151",
+ (Var("googlecode_url") % "grit-i18n") + "/trunk@157",
"src/tools/gyp":
- (Var("googlecode_url") % "gyp") + "/trunk@1854",
+ (Var("googlecode_url") % "gyp") + "/trunk@1880",
"src/tools/swarming_client":
Var("chromium_git") + "/external/swarming.client.git@" +
Var("swarming_revision"),
"src/v8":
- (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),
+ (Var("googlecode_url") % "v8") + "/" + Var("v8_branch") + "@" +
+ Var("v8_revision"),
"src/native_client":
Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"),
@@ -165,11 +168,11 @@
(Var("googlecode_url") % "skia") + "/trunk/include@" + Var("skia_revision"),
"src/third_party/ots":
- (Var("googlecode_url") % "ots") + "/trunk@110",
+ (Var("googlecode_url") % "ots") + "/trunk@112",
"src/third_party/brotli/src":
Var("chromium_git") +
- "/external/font-compression-reference.git@dfc5a9f2151a7c88914c236c7db8fa119fee249c",
+ "/external/font-compression-reference.git@0829e37293abc2523a1d2b0f4d68ff7b5fcd8e01",
"src/tools/page_cycler/acid3":
"/trunk/deps/page_cycler/acid3@171600",
@@ -188,7 +191,7 @@
"src/third_party/webgl/src":
Var("chromium_git") +
- "/external/khronosgroup/webgl.git@159f31dd34842c871032d97d360a9dce5153f585",
+ "/external/khronosgroup/webgl.git@b6bce42c2484666d3e28dc25b12f27eb06f39f27",
"src/third_party/swig/Lib":
"/trunk/deps/third_party/swig/Lib@" + Var("swig_revision"),
@@ -223,7 +226,7 @@
"/trunk/deps/third_party/yasm/patched-yasm@167605",
"src/third_party/libjpeg_turbo":
- "/trunk/deps/third_party/libjpeg_turbo@251747",
+ "/trunk/deps/third_party/libjpeg_turbo@259851",
"src/third_party/flac":
"/trunk/deps/third_party/flac@222897",
@@ -239,7 +242,7 @@
(Var("googlecode_url") % "webrtc") + "/trunk/webrtc@" + Var("webrtc_revision"),
"src/third_party/openmax_dl":
- (Var("googlecode_url") % "webrtc") + "/deps/third_party/openmax@5205",
+ (Var("googlecode_url") % "webrtc") + "/deps/third_party/openmax@5569",
"src/third_party/jsoncpp/source/include":
(Var("sourceforge_url") % {"repo": "jsoncpp"}) +
@@ -250,7 +253,7 @@
"/trunk/jsoncpp/src/lib_json@" + Var("jsoncpp_revision"),
"src/third_party/libyuv":
- (Var("googlecode_url") % "libyuv") + "/trunk@979",
+ (Var("googlecode_url") % "libyuv") + "/trunk@986",
"src/third_party/smhasher/src":
(Var("googlecode_url") % "smhasher") + "/trunk@151",
@@ -276,40 +279,43 @@
"/trunk/tools/deps2git@248305",
"src/third_party/clang_format/script":
- Var("llvm_url") + "/cfe/trunk/tools/clang-format@198831",
+ Var("llvm_url") + "/cfe/trunk/tools/clang-format@202065",
"src/third_party/webpagereplay":
- (Var("googlecode_url") % "web-page-replay") + "/trunk@540",
+ (Var("googlecode_url") % "web-page-replay") + "/trunk@544",
"src/third_party/pywebsocket/src":
- (Var("googlecode_url") % "pywebsocket") + "/trunk/src@662",
+ (Var("googlecode_url") % "pywebsocket") + "/trunk/src@790",
"src/third_party/opus/src":
- "/trunk/deps/third_party/opus@237544",
+ "/trunk/deps/third_party/opus@256783",
"src/media/cdm/ppapi/api":
"/trunk/deps/cdm@249141",
"src/third_party/mesa/src":
- "/trunk/deps/third_party/mesa@240938",
+ "/trunk/deps/third_party/mesa@254411",
"src/third_party/cld_2/src":
- (Var("googlecode_url") % "cld2") + "/trunk@84",
+ (Var("googlecode_url") % "cld2") + "/trunk@157",
"src/chrome/browser/resources/pdf/html_office":
Var("chromium_git") +
- "/chromium/html-office-public.git@6451249cec79299a52083373c9a370ef25471023",
+ "/chromium/html-office-public.git@9f76cc282c471ae4ff77415384db039fcab2faa8",
"src/third_party/libwebm/source":
Var("chromium_git") +
"/webm/libwebm.git@0f7815b036651e242ec8c2fcfb59fe54f69be1a8",
+
+ "src/third_party/openssl":
+ "/trunk/deps/third_party/openssl@" + Var("openssl_revision"),
}
deps_os = {
"win": {
"src/chrome/tools/test/reference_build/chrome_win":
- "/trunk/deps/reference_builds/chrome_win@237381",
+ "/trunk/deps/reference_builds/chrome_win@254637",
"src/third_party/cygwin":
"/trunk/deps/third_party/cygwin@231940",
@@ -356,7 +362,7 @@
# Binary level profile guided optimizations. This points to the
# latest release binaries for the toolchain.
"src/third_party/syzygy/binaries":
- (Var("googlecode_url") % "sawbuck") + "/trunk/syzygy/binaries@2021",
+ (Var("googlecode_url") % "sawbuck") + "/trunk/syzygy/binaries@2058",
# Binaries for nacl sdk.
"src/third_party/nacl_sdk_binaries":
@@ -385,12 +391,15 @@
"src/native_client/src/third_party/ppapi": None,
"src/third_party/angle": None,
"src/third_party/bidichecker": None,
+ "src/third_party/brotli/src": None,
"src/third_party/cld_2/src": None,
"src/third_party/ffmpeg": None,
"src/third_party/hunspell_dictionaries": None,
"src/third_party/hunspell": None,
"src/third_party/libaddressinput/src/cpp": None,
"src/third_party/libaddressinput/src/testdata": None,
+ "src/third_party/libc++/trunk": None,
+ "src/third_party/libc++abi/trunk": None,
"src/third_party/libexif/sources": None,
"src/third_party/libjpeg_turbo": None,
"src/third_party/libsrtp": None,
@@ -404,22 +413,23 @@
"src/third_party/safe_browsing/testing": None,
"src/third_party/scons-2.0.1": None,
"src/third_party/sfntly/cpp/src": None,
- "src/third_party/smhasher/src": None,
+ "src/third_party/speex": None,
"src/third_party/swig/Lib": None,
- "src/third_party/undoview": None,
"src/third_party/usrsctp/usrsctplib": None,
"src/third_party/v8-i18n": None,
"src/third_party/webdriver/pylib": None,
"src/third_party/webgl": None,
"src/third_party/webpagereplay": None,
"src/third_party/webrtc": None,
+ "src/third_party/WebKit/LayoutTests/w3c/web-platform-tests": None,
+ "src/third_party/WebKit/LayoutTests/w3c/csswg-test": None,
"src/third_party/yasm/source/patched-yasm": None,
"src/tools/page_cycler/acid3": None,
"src/v8": None,
},
"mac": {
"src/chrome/tools/test/reference_build/chrome_mac":
- "/trunk/deps/reference_builds/chrome_mac@237381",
+ "/trunk/deps/reference_builds/chrome_mac@255182",
"src/third_party/google_toolbox_for_mac/src":
(Var("googlecode_url") % "google-toolbox-for-mac") + "/trunk@" +
@@ -444,7 +454,7 @@
"unix": {
# Linux, really.
"src/chrome/tools/test/reference_build/chrome_linux":
- "/trunk/deps/reference_builds/chrome_linux64@237381",
+ "/trunk/deps/reference_builds/chrome_linux64@254637",
"src/third_party/xdg-utils":
"/trunk/deps/third_party/xdg-utils@203785",
@@ -456,9 +466,6 @@
((Var("googlecode_url") % "linux-syscall-support") + "/trunk/lss@" +
Var("lss_revision")),
- "src/third_party/openssl":
- "/trunk/deps/third_party/openssl@" + Var("openssl_revision"),
-
"src/third_party/gold":
"/trunk/deps/third_party/gold@228995",
@@ -468,17 +475,17 @@
# Used on Linux only. CrOS already has a copy.
"src/third_party/mtpd/source":
Var("chromiumos_git") + "/platform/mtpd.git" +
- "@e4e4656e9aa710f0617dab8746ab6116c0506ceb",
+ "@f9759da3a7cd95080414a7da0d899c47cad794f2",
# Used on Linux only. CrOS already has a copy.
"src/third_party/cros_dbus_cplusplus/source":
Var("chromiumos_git") + "/third_party/dbus-cplusplus.git" +
- "@e4120532bbf3ca9f743b0be1f539381a54d16867",
+ "@f78453e0ba9f3d1584e8873aa3c7437cec861ce0",
# For Linux and Chromium OS.
"src/third_party/cros_system_api":
Var("chromiumos_git") + "/platform/system_api.git" +
- "@874a39664f1538b1855391f98bf14026a5dd2c24",
+ "@844a42e5f5c7a106807b09b6c2ac6b00b166c1cc",
# Note that this is different from Android's freetype repo.
"src/third_party/freetype2/src":
@@ -488,7 +495,7 @@
# Build tools for targeting ChromeOS.
"src/third_party/chromite":
Var("chromiumos_git") + "/chromite.git" +
- "@1ee2901d33ae698d1f2a1d95e9f3fd5bbd5f13f9",
+ "@473f7ab6baf1781618f379a7680b56048b5e0ec1",
# Dependency of chromite.git.
"src/third_party/pyelftools":
@@ -510,7 +517,7 @@
"android": {
"src/third_party/android_tools":
Var("chromium_git") + "/android_tools.git" +
- "@0582bdc17b4829beb522975441546a4eb99b11b5",
+ "@ca35676f4f652fa97964c488313720f55efd4405",
"src/third_party/aosp":
"/trunk/deps/third_party/aosp@148330",
@@ -545,9 +552,6 @@
((Var("googlecode_url") % "linux-syscall-support") + "/trunk/lss@" +
Var("lss_revision")),
- "src/third_party/openssl":
- "/trunk/deps/third_party/openssl@" + Var("openssl_revision"),
-
"src/third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille":
(Var("googlecode_url") % "eyes-free") + "/trunk/braille/client/src/com/googlecode/eyesfree/braille@797",
@@ -638,12 +642,10 @@
"--arch=i386"],
},
{
- # Pull clang on mac. If nothing changed, or on non-mac platforms, this takes
- # zero seconds to run. If something changed, it downloads a prebuilt clang,
- # which takes ~20s, but clang speeds up builds by more than 20s.
+ # Pull clang if on Mac or clang is requested via GYP_DEFINES.
"name": "clang",
"pattern": ".",
- "action": ["python", "src/tools/clang/scripts/update.py", "--mac-only"],
+ "action": ["python", "src/tools/clang/scripts/update.py", "--if-needed"],
},
{
# Update LASTCHANGE. This is also run by export_tarball.py in
@@ -665,7 +667,7 @@
# Pull GN binaries. This needs to be before running GYP below.
{
"name": "gn_win",
- "pattern": "src/tools/gn/bin/win/gn.exe.sha1",
+ "pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=win32",
@@ -676,7 +678,7 @@
},
{
"name": "gn_mac",
- "pattern": "src/tools/gn/bin/mac/gn.sha1",
+ "pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=darwin",
@@ -687,7 +689,7 @@
},
{
"name": "gn_linux",
- "pattern": "src/tools/gn/bin/linux/gn.sha1",
+ "pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=linux*",
@@ -698,7 +700,7 @@
},
{
"name": "gn_linux32",
- "pattern": "src/tools/gn/bin/linux/gn32.sha1",
+ "pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=linux*",
@@ -710,7 +712,7 @@
# Pull clang-format binaries using checked-in hashes.
{
"name": "clang_format_win",
- "pattern": "src/third_party/clang_format/bin/win/clang-format.exe.sha1",
+ "pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=win32",
@@ -721,7 +723,7 @@
},
{
"name": "clang_format_mac",
- "pattern": "src/third_party/clang_format/bin/mac/clang-format.sha1",
+ "pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=darwin",
@@ -732,7 +734,7 @@
},
{
"name": "clang_format_linux",
- "pattern": "src/third_party/clang_format/bin/linux/clang-format.sha1",
+ "pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=linux*",
@@ -744,7 +746,7 @@
# Pull eu-strip binaries using checked-in hashes.
{
"name": "eu-strip",
- "pattern": "src/build/linux/bin/eu-strip.sha1",
+ "pattern": ".",
"action": [ "download_from_google_storage",
"--no_resume",
"--platform=linux*",
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698