summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git74
1 files changed, 56 insertions, 18 deletions
diff --git a/.DEPS.git b/.DEPS.git
index 4707355..bd3e77d 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -1,22 +1,42 @@
# DO NOT EDIT EXCEPT FOR LOCAL TESTING.
# THIS IS A GENERATED FILE.
# ALL MANUAL CHANGES WILL BE OVERWRITTEN.
-# SEE http://code.google.com/p/chromium/wiki/UsingNewGit
+# SEE http://code.google.com/p/chromium/wiki/UsingGit
# FOR HOW TO ROLL DEPS
vars = {
- 'ffmpeg_hash':
- '@04db474e52bae0eef2cd22341aca1caf427411de',
'webkit_url':
'https://chromium.googlesource.com/chromium/blink.git',
'git_url':
'https://chromium.googlesource.com',
'webkit_rev':
- '@900ed2ae4748f3059f2a419927515ce869a7785f'
+ '@166d909d9ae897df795f33fe9148117d32ebb1ec',
+ 'angle_revision':
+ '74d5875fb30211bdbc07be4362345116132b0548'
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@f012e884ba20d41f253529979cd060d2fdd275f0',
+ 'build/scripts/command_wrapper/bin':
+ Var('git_url') + '/chromium/tools/command_wrapper/bin.git@2eeebba9a512cae9e4e9312f5ec728dbdad80bd0',
+ 'build/scripts/gsd_generate_index':
+ Var('git_url') + '/chromium/tools/gsd_generate_index.git@d2f5d5a5d212d8fb337d751c0351644a6ac83ac8',
+ 'build/scripts/private/data/reliability':
+ Var('git_url') + '/chromium/src.git@acfbc85e2980a8f596194dd8c0f49cbdc3860a5b',
+ 'build/third_party/gsutil':
+ Var('git_url') + '/external/gsutil/src.git@5cba434b828da428a906c8197a23c9ae120d2636',
+ 'build/third_party/lighttpd':
+ Var('git_url') + '/chromium/deps/lighttpd.git@9dfa55d15937a688a92cbf2b7a8621b0927d06eb',
+ 'build/third_party/swarm_client':
+ Var('git_url') + '/chromium/tools/swarm_client.git@f3da3b15af904d1c0eda7f3250b0bf708094a0d7',
+ 'commit-queue':
+ Var('git_url') + '/chromium/tools/commit-queue.git@a154ae9df9e0dc7ecb34e026da380522df81aa54',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@833a3853e8054e591d214351d007033a84133c7f',
+ 'src':
+ Var('git_url') + '/chromium/src.git@e9ab54e5a517da5be50b9dfe16e15516e277f073',
'src/breakpad/src':
- Var('git_url') + '/external/google-breakpad/src.git@115860628d1ac4838e9d0e6f9af7eab4cd505209',
+ Var('git_url') + '/external/google-breakpad/src.git@7151416015f1c5069cc78ffb31b1e6fb0e96c635',
'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
Var('git_url') + '/native_client/src/native_client/tests/prebuilt.git@3e17365176c94624f46cace174f61834b7f3c35d',
'src/chrome/test/data/perf/canvas_bench':
@@ -25,6 +45,8 @@ deps = {
Var('git_url') + '/chromium/frame_rate/content.git@c10272c88463efeef6bb19c9ec07c42bc8fe22b9',
'src/chrome/test/data/perf/third_party/octane':
Var('git_url') + '/external/octane-benchmark.git@9ac27bfd9e0bc73663db0c0551440215d8b20d09',
+ 'src/content/test/data/layout_tests':
+ Var('webkit_url') + '@166d909d9ae897df795f33fe9148117d32ebb1ec',
'src/googleurl':
Var('git_url') + '/external/google-url.git@8debb9b26bab1b66e9b28a58447338eca544765d',
'src/native_client':
@@ -36,17 +58,17 @@ deps = {
'src/testing/gtest':
Var('git_url') + '/external/googletest.git@a6772271f71672e889776bfe49ec4efd9da036df',
'src/third_party/WebKit':
- Var('webkit_url') + Var('webkit_rev'),
+ Var('webkit_url') + '' + Var('webkit_rev'),
'src/third_party/accessibility-developer-tools':
Var('git_url') + '/external/accessibility-developer-tools.git@ad5df9a5341d38778658c90e4aa241c4ebe4e8aa',
'src/third_party/angle':
- Var('git_url') + '/external/angleproject.git@4a3734a39070c419edc9a153288bce030f226897',
+ Var('git_url') + '/external/angleproject.git' + '@' + Var('angle_revision'),
'src/third_party/bidichecker':
Var('git_url') + '/external/bidichecker/lib.git@97f2aa645b74c28c57eca56992235c79850fa9e0',
'src/third_party/cacheinvalidation/src':
Var('git_url') + '/external/google-cache-invalidation-api/src.git@c1f7ac8238380b95ad4664a08afd10568a3bdc20',
'src/third_party/ffmpeg':
- Var('git_url') + '/chromium/third_party/ffmpeg.git' + Var('ffmpeg_hash'),
+ Var('git_url') + '/chromium/deps/ffmpeg.git@20a041bcac90d6ad049eecd66ca4438a4dcba12e',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@92306ca4073ee0a9df9dc4a87e40a7b3fd595d02',
'src/third_party/hunspell':
@@ -64,7 +86,7 @@ deps = {
'src/third_party/libexif/sources':
Var('git_url') + '/chromium/deps/libexif/sources.git@d815c325bab0d1871d4c7e70600ecdfdab07db9e',
'src/third_party/libjingle/source':
- Var('git_url') + '/external/libjingle.git@8b304a438d8dec5ddbb5b29f5752716d9f5acd9e',
+ Var('git_url') + '/external/libjingle.git@4ba9aa5a0d8fe817750eadb8b2ff42ec7ce2eab6',
'src/third_party/libjpeg_turbo':
Var('git_url') + '/chromium/deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3',
'src/third_party/libphonenumber/src/phonenumbers':
@@ -98,11 +120,11 @@ deps = {
'src/third_party/sfntly/cpp/src':
Var('git_url') + '/external/sfntly/cpp/src.git@cfb2f1743f0169ad8d01035458617bce97107539',
'src/third_party/skia/gyp':
- Var('git_url') + '/external/skia/gyp.git@5d792b8ed972cb64e167c21e12b7d13058d01612',
+ Var('git_url') + '/external/skia/gyp.git@0c16f26511915e3a84ecd8b8ae288d58b983d7e8',
'src/third_party/skia/include':
- Var('git_url') + '/external/skia/include.git@37530f70afd5c4fc699146f6e52a17c9e490ac88',
+ Var('git_url') + '/external/skia/include.git@58271026dd7818d5adf5735eabb5d0402a8a6161',
'src/third_party/skia/src':
- Var('git_url') + '/external/skia/src.git@7ea45d0e9d51000e43a7f87a7030cdf7d61f8334',
+ Var('git_url') + '/external/skia/src.git@9d5ecec6759d9c286267d42df2550b93a23eed81',
'src/third_party/smhasher/src':
Var('git_url') + '/external/smhasher.git@8adb1336422e3ad4d78ba54fb56692f2ed07124c',
'src/third_party/snappy/src':
@@ -124,7 +146,7 @@ deps = {
'src/third_party/webpagereplay':
Var('git_url') + '/external/web-page-replay.git@12f859a96f3508ebbba8a0b196cce4769b3478c0',
'src/third_party/webrtc':
- Var('git_url') + '/external/webrtc/stable/webrtc.git@89b33d1ab3ec9f5ec5eda7e5cabfe53eb1deb06d',
+ Var('git_url') + '/external/webrtc/trunk/webrtc.git@8effeec45c53982b17508ade9b9615e6084ab7ca',
'src/third_party/yasm/source/patched-yasm':
Var('git_url') + '/chromium/deps/yasm/patched-yasm.git@c960eb11ccda80b10ed50be39df4f0663b371d1d',
'src/tools/deps2git':
@@ -138,7 +160,7 @@ deps = {
'src/tools/swarm_client':
Var('git_url') + '/chromium/tools/swarm_client.git@f45530cfdad793e211f0befcc85df13fbbe8165f',
'src/v8':
- Var('git_url') + '/external/v8.git@87a74ee197718a2c3049986df903f3141ab00255',
+ Var('git_url') + '/external/v8.git@63515607c46e68a37bf69d0f896b37d71ca6afc0',
'src/webkit/media/crypto/ppapi/cdm':
Var('git_url') + '/chromium/cdm.git@c2b192a02546916d28233cfd8b7717ffcdcc8347',
}
@@ -303,7 +325,7 @@ deps_os = {
'src/chrome/installer/mac/third_party/xz/xz':
Var('git_url') + '/chromium/deps/xz.git@dd8415469606fe7bfdc2ebc12b8457b912ede326',
'src/chrome/tools/test/reference_build/chrome_mac':
- Var('git_url') + '/chromium/reference_builds/chrome_mac.git@4c3f8cbeff8525e43710bc655bcf455546b9261d',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/GTM':
Var('git_url') + '/external/google-toolbox-for-mac.git@1f3578bb9c3cfdf1293f106f07e5b0b3e19ae543',
'src/third_party/lighttpd':
@@ -317,8 +339,14 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git@90b67db0c591f01b021d2b0c8a277fde52763558',
+ 'build/third_party/xvfb':
+ Var('git_url') + '/chromium/tools/third_party/xvfb.git@aebb1aadf1422e4d81e831e13746b8f7ae322e07',
+ 'build/xvfb':
+ Var('git_url') + '/chromium/tools/xvfb.git@077af3535e54dbb782a355b81ba69ea17ec6bde5',
'src/chrome/tools/test/reference_build/chrome_linux':
- Var('git_url') + '/chromium/reference_builds/chrome_linux.git@216cf5b1b3e97e285e0ee361f54e8f7a30c6af00',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/chromite':
Var('git_url') + '/chromiumos/chromite.git@dfd2710856705831dd4e8cd6267899fd4721e11a',
'src/third_party/cros_dbus_cplusplus/source':
@@ -347,9 +375,9 @@ deps_os = {
'win':
{
'src/chrome/tools/test/reference_build/chrome_win':
- Var('git_url') + '/chromium/reference_builds/chrome_win.git@38a346604619ded06915c0b60c4229421effc1e4',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/chrome_frame/tools/test/reference_build/chrome_win':
- Var('git_url') + '/chromium/reference_builds/chrome_win.git@b9f52667918a74977cb85eefd4e967150f852fbc',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/bison':
Var('git_url') + '/chromium/deps/bison.git@083c9a45e4affdd5464ee2b224c2df649c6e26c3',
'src/third_party/cygwin':
@@ -438,6 +466,16 @@ hooks = [
'action':
[
'python',
+ 'src/build/linux/install-debian.wheezy.sysroot.wrapper.py',
+ '--linux-only'
+],
+ 'pattern':
+ '.'
+},
+ {
+ 'action':
+ [
+ 'python',
'src/tools/clang/scripts/update.py',
'--mac-only'
],