# See http://code.google.com/p/chromium/wiki/UsingGit
#
# To test manually, run:
-# python tools/deps2git/deps2git.py -o .DEPS.git
+# python tools/deps2git/deps2git.py -o .DEPS.git -w <gclientdir>
# gclient runhooks
+# where <gcliendir> is the absolute path to the directory containing the
+# .gclient file (the parent of "src").
# DO NOT CHECK IN CHANGES TO .DEPS.git. It will be automatically updated by
# a bot when you modify this one.
#
"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": "197314",
- "libcxxabi_revision": "197063",
+ "libcxx_revision": "206024",
+ "libcxxabi_revision": "206024",
"webkit_trunk": "http://src.chromium.org/blink/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "170313",
+ "webkit_revision": "173750",
"chromium_git": "https://chromium.googlesource.com",
"chromiumos_git": "https://chromium.googlesource.com/chromiumos",
"skia_git": "https://skia.googlesource.com",
"swig_revision": "230490",
- "nacl_revision": "12935",
+ "nacl_revision": "13159",
# 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
+ "nacl_tools_revision": "13077", # native_client/DEPS: tools_rev
"google_toolbox_for_mac_revision": "662",
"libaddressinput_revision": "176",
"libphonenumber_revision": "621",
- "libvpx_revision": "259953",
- "lss_revision": "24",
+ "libvpx_revision": "269083",
+ "lss_revision": "26",
# These two FFmpeg variables must be updated together. One is used for SVN
# checkouts and the other for Git checkouts.
- "ffmpeg_revision": "255431",
- "ffmpeg_hash": "681ca6bfed239ad2e1a6a3c8a586839c6dbd3e87",
+ "ffmpeg_revision": "264299",
+ "ffmpeg_hash": "ac4a9f31fe2610bd146857bbd55d7a260003a888",
"sfntly_revision": "228",
"lighttpd_revision": "33737",
- "skia_revision": "13966",
- "skia_hash": "c94a028ff836f8f0af41ec33ceb1f4bc140841bf",
+ "skia_revision": "14592",
+ "skia_hash": "24f6e29fc133f1082c73e2a96f30bee92e3123aa",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and V8 without interference from each other.
"v8_branch": "trunk",
- "v8_revision": "20290",
+ "v8_revision": "21152",
# 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": "5807",
+ "webrtc_revision": "6085",
"jsoncpp_revision": "248",
- "nss_revision": "259440",
+ "nss_revision": "267366",
# 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": "8472efa59518a6e28db6da249685d65f49ce8244",
+ "swarming_revision": "ae8085b09e6162b4ec869e430d7d09c16b32b433",
# 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": "253925",
+ "openssl_revision": "267674",
# 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",
+ "angle_revision": "74697cf2064c0a2c0d7e1b1b28db439286766a05",
}
deps = {
"src/breakpad/src":
- (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1289",
+ (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1325",
"src/sdch/open-vcdiff":
(Var("googlecode_url") % "open-vcdiff") + "/trunk@42",
Var("chromium_git") + "/angle/angle.git@" + Var("angle_revision"),
"src/third_party/trace-viewer":
- (Var("googlecode_url") % "trace-viewer") + "/trunk@1212",
+ (Var("googlecode_url") % "trace-viewer") + "/trunk@1267",
"src/third_party/WebKit":
Var("webkit_trunk") + "@" + Var("webkit_revision"),
"src/third_party/WebKit/LayoutTests/w3c/web-platform-tests":
Var("chromium_git") +
- "/external/w3c/web-platform-tests.git@ac4322a338be82b3d8b722917d6d3d057c0a3f6a",
+ "/external/w3c/web-platform-tests.git@6bed4516fe8522d65512c76ef02e4f0ae8234395",
"src/third_party/WebKit/LayoutTests/w3c/csswg-test":
Var("chromium_git") +
- "/external/w3c/csswg-test.git@8c415e3215a203fa3a22dbdd1799279fdf44c81e",
+ "/external/w3c/csswg-test.git@bacbb4a8dca702cd86646761fde96793db13d4f1",
"src/third_party/icu":
- "/trunk/deps/third_party/icu46@259309",
+ "/trunk/deps/third_party/icu46@262949",
"src/third_party/libexif/sources":
- "/trunk/deps/third_party/libexif/sources@146817",
+ "/trunk/deps/third_party/libexif/sources@265008",
"src/third_party/hunspell":
"/trunk/deps/third_party/hunspell@256272",
"src/third_party/cacheinvalidation/src":
(Var("googlecode_url") % "google-cache-invalidation-api") +
- "/trunk/src@330",
+ "/trunk/src@331",
"src/third_party/leveldatabase/src":
- (Var("googlecode_url") % "leveldb") + "/trunk@79",
+ (Var("googlecode_url") % "leveldb") + "/trunk@80",
"src/third_party/libc++/trunk":
Var("llvm_url") + "/libcxx/trunk@" + Var("libcxx_revision"),
(Var("googlecode_url") % "snappy") + "/trunk@80",
"src/tools/grit":
- (Var("googlecode_url") % "grit-i18n") + "/trunk@157",
+ (Var("googlecode_url") % "grit-i18n") + "/trunk@167",
"src/tools/gyp":
- (Var("googlecode_url") % "gyp") + "/trunk@1880",
+ (Var("googlecode_url") % "gyp") + "/trunk@1918",
"src/tools/swarming_client":
Var("chromium_git") + "/external/swarming.client.git@" +
(Var("googlecode_url") % "skia") + "/trunk/include@" + Var("skia_revision"),
"src/third_party/ots":
- (Var("googlecode_url") % "ots") + "/trunk@112",
+ (Var("googlecode_url") % "ots") + "/trunk@113",
"src/third_party/brotli/src":
Var("chromium_git") +
"src/third_party/webgl/src":
Var("chromium_git") +
- "/external/khronosgroup/webgl.git@b6bce42c2484666d3e28dc25b12f27eb06f39f27",
+ "/external/khronosgroup/webgl.git@1700aa98cc8bc494b305d4ec1045797bc4030f45",
"src/third_party/swig/Lib":
"/trunk/deps/third_party/swig/Lib@" + Var("swig_revision"),
"src/third_party/usrsctp/usrsctplib":
(Var("googlecode_url") % "sctp-refimpl") +
- "/trunk/KERN/usrsctp/usrsctplib@8723",
+ "/trunk/KERN/usrsctp/usrsctplib@8838",
"src/third_party/libsrtp":
- "/trunk/deps/third_party/libsrtp@250757",
+ "/trunk/deps/third_party/libsrtp@261337",
"src/third_party/speex":
"/trunk/deps/third_party/speex@198168",
"/trunk/deps/third_party/yasm/patched-yasm@167605",
"src/third_party/libjpeg_turbo":
- "/trunk/deps/third_party/libjpeg_turbo@259851",
+ "/trunk/deps/third_party/libjpeg_turbo@263594",
"src/third_party/flac":
"/trunk/deps/third_party/flac@222897",
(Var("googlecode_url") % "webrtc") + "/trunk/webrtc@" + Var("webrtc_revision"),
"src/third_party/openmax_dl":
- (Var("googlecode_url") % "webrtc") + "/deps/third_party/openmax@5569",
+ (Var("googlecode_url") % "webrtc") + "/deps/third_party/openmax@6024",
"src/third_party/jsoncpp/source/include":
(Var("sourceforge_url") % {"repo": "jsoncpp"}) +
"/trunk/jsoncpp/src/lib_json@" + Var("jsoncpp_revision"),
"src/third_party/libyuv":
- (Var("googlecode_url") % "libyuv") + "/trunk@986",
+ (Var("googlecode_url") % "libyuv") + "/trunk@1000",
"src/third_party/smhasher/src":
- (Var("googlecode_url") % "smhasher") + "/trunk@151",
+ (Var("googlecode_url") % "smhasher") + "/trunk@152",
"src/third_party/libaddressinput/src/cpp":
(Var("googlecode_url") % "libaddressinput") + "/trunk/cpp@" +
Var("libphonenumber_revision"),
"src/tools/deps2git":
- "/trunk/tools/deps2git@248305",
+ "/trunk/tools/deps2git@262731",
"src/third_party/clang_format/script":
- Var("llvm_url") + "/cfe/trunk/tools/clang-format@202065",
+ Var("llvm_url") + "/cfe/trunk/tools/clang-format@206068",
"src/third_party/webpagereplay":
(Var("googlecode_url") % "web-page-replay") + "/trunk@544",
"/trunk/deps/third_party/opus@256783",
"src/media/cdm/ppapi/api":
- "/trunk/deps/cdm@249141",
+ "/trunk/deps/cdm@262570",
"src/third_party/mesa/src":
- "/trunk/deps/third_party/mesa@254411",
+ "/trunk/deps/third_party/mesa@265279",
"src/third_party/cld_2/src":
- (Var("googlecode_url") % "cld2") + "/trunk@157",
+ (Var("googlecode_url") % "cld2") + "/trunk@160",
"src/chrome/browser/resources/pdf/html_office":
Var("chromium_git") +
- "/chromium/html-office-public.git@9f76cc282c471ae4ff77415384db039fcab2faa8",
+ "/chromium/html-office-public.git@eeff97614f65e0578529490d44d412032c3d7359",
"src/third_party/libwebm/source":
Var("chromium_git") +
- "/webm/libwebm.git@0f7815b036651e242ec8c2fcfb59fe54f69be1a8",
+ "/webm/libwebm.git@fb6b6e64444c637f27d103fd113e0c7bf4f107dd",
"src/third_party/openssl":
"/trunk/deps/third_party/openssl@" + Var("openssl_revision"),
((Var("googlecode_url") % "linux-syscall-support") + "/trunk/lss@" +
Var("lss_revision")),
- "src/third_party/gold":
- "/trunk/deps/third_party/gold@228995",
-
- "src/third_party/libmtp":
- "/trunk/deps/third_party/libmtp@206535",
-
- # Used on Linux only. CrOS already has a copy.
- "src/third_party/mtpd/source":
- Var("chromiumos_git") + "/platform/mtpd.git" +
- "@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" +
- "@f78453e0ba9f3d1584e8873aa3c7437cec861ce0",
-
# For Linux and Chromium OS.
"src/third_party/cros_system_api":
Var("chromiumos_git") + "/platform/system_api.git" +
- "@844a42e5f5c7a106807b09b6c2ac6b00b166c1cc",
+ "@5b855c05cbbd9d4dcd7430fa58e73a296d038047",
# Note that this is different from Android's freetype repo.
"src/third_party/freetype2/src":
# Build tools for targeting ChromeOS.
"src/third_party/chromite":
Var("chromiumos_git") + "/chromite.git" +
- "@473f7ab6baf1781618f379a7680b56048b5e0ec1",
+ "@63193a4393f6e964bfca992bfb03e40183554f7d",
# Dependency of chromite.git.
"src/third_party/pyelftools":
"android": {
"src/third_party/android_tools":
Var("chromium_git") + "/android_tools.git" +
- "@ca35676f4f652fa97964c488313720f55efd4405",
+ "@bf45c76e0eb23b7b7a9d5f26b28c16983daa173b",
"src/third_party/aosp":
"/trunk/deps/third_party/aosp@148330",
"pattern": ".",
"action": [
"python", "src/build/download_nacl_toolchains.py",
- "--no-arm-trusted",
- "--keep",
+ "--exclude", "arm_trusted",
],
},
{
"action": ["python", "src/tools/clang/scripts/update.py", "--if-needed"],
},
{
+ # Update the Windows toolchain if necessary.
+ "name": "win_toolchain",
+ "pattern": ".",
+ "action": ["python", "src/build/vs_toolchain.py", "update"],
+ },
+ {
# Update LASTCHANGE. This is also run by export_tarball.py in
# src/tools/export_tarball - please keep them in sync.
"name": "lastchange",
"-s", "src/third_party/clang_format/bin/linux/clang-format.sha1",
],
},
+ # Pull binutils for linux, enabled debug fission for faster linking /
+ # debugging when used with clang on Ubuntu Precise.
+ # https://code.google.com/p/chromium/issues/detail?id=352046
+ {
+ "name": "binutils",
+ "pattern": "src/third_party/binutils",
+ "action": [
+ "python",
+ "src/third_party/binutils/download.py",
+ ],
+ },
# Pull eu-strip binaries using checked-in hashes.
{
"name": "eu-strip",
projects / platform / framework / web / crosswalk.git / blobdiff