summaryrefslogtreecommitdiffstats
path: root/.DEPS.git
diff options
context:
space:
mode:
Diffstat (limited to '.DEPS.git')
-rw-r--r--.DEPS.git48
1 files changed, 35 insertions, 13 deletions
diff --git a/.DEPS.git b/.DEPS.git
index 6518637..67ab241 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -4,19 +4,31 @@
# SEE http://code.google.com/p/chromium/wiki/UsingGit
# FOR HOW TO ROLL DEPS
vars = {
- 'ffmpeg_hash':
- '@ac4a9f31fe2610bd146857bbd55d7a260003a888',
'webkit_url':
'https://chromium.googlesource.com/chromium/blink.git',
'git_url':
'https://chromium.googlesource.com',
'webkit_rev':
- '@0a2c3c6e6bc0f036aa5a86baadeb9b0f6946efce',
+ '@f0ce224fba9507e482fdf9e92d4b621a7aaffe07',
'angle_revision':
- '74697cf2064c0a2c0d7e1b1b28db439286766a05'
+ 'd3d870647655ea8292cee9a1b65820547b13ac0c'
}
deps = {
+ 'build':
+ Var('git_url') + '/chromium/tools/build.git@ab76c6104de10e18d1e0beb6405964550ccfe274',
+ '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/chrome/test/data/reliability.git@90d6f258a2fbff583dcfc107ab1727bd8efe65e8',
+ 'build/scripts/tools/deps2git':
+ Var('git_url') + '/chromium/tools/deps2git.git@05bbcc31bde9ab58b6e8f8d231088f2467480314',
+ 'build/third_party/lighttpd':
+ Var('git_url') + '/chromium/deps/lighttpd.git@9dfa55d15937a688a92cbf2b7a8621b0927d06eb',
+ 'depot_tools':
+ Var('git_url') + '/chromium/tools/depot_tools.git@c4396a1b4e231e3b271e36d7b76e280e89245b04',
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@c7c6e51faeb9c1e8fbe285a1b28a5039b345f139',
'src/chrome/browser/resources/pdf/html_office':
@@ -58,7 +70,7 @@ deps = {
'src/third_party/cld_2/src':
Var('git_url') + '/external/cld2.git@3fced387543ba9bed402923b3c6feb459fb61f58',
'src/third_party/ffmpeg':
- Var('git_url') + '/chromium/third_party/ffmpeg.git' + Var('ffmpeg_hash'),
+ Var('git_url') + '/chromium/deps/ffmpeg.git@441565dde44f6bb71d75034b7f9e8a974ce059e5',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@71e33f190a7bb144fe4e2014897b8d15c8247198',
'src/third_party/hunspell':
@@ -104,7 +116,7 @@ deps = {
'src/third_party/openmax_dl':
Var('git_url') + '/external/webrtc/deps/third_party/openmax.git@cf42f62aae8cb9c9e0ed021ee6985affbe118677',
'src/third_party/openssl':
- Var('git_url') + '/chromium/deps/openssl.git@55b9eb8eb546355b3d55945cf09a45a434cd796f',
+ Var('git_url') + '/chromium/deps/openssl.git@90da25d0b079c3c5547f07948684f80c4e9c3584',
'src/third_party/opus/src':
Var('git_url') + '/chromium/deps/opus.git@36fa2621472ebf5b859fd16bbdb749019c68cc69',
'src/third_party/ots':
@@ -144,7 +156,7 @@ deps = {
'src/third_party/webpagereplay':
Var('git_url') + '/external/web-page-replay.git@1cf80576c1c4beb6185af0ac70eb7379c5e8262b',
'src/third_party/webrtc':
- Var('git_url') + '/external/webrtc/trunk/webrtc.git@e1f0419756d58f744f902fe62fa31da126c55abe',
+ Var('git_url') + '/external/webrtc/trunk/webrtc.git@2efb7af01e3cbe87cb05d49893922e5f88a32115',
'src/third_party/yasm/source/patched-yasm':
Var('git_url') + '/chromium/deps/yasm/patched-yasm.git@c960eb11ccda80b10ed50be39df4f0663b371d1d',
'src/tools/deps2git':
@@ -158,12 +170,14 @@ deps = {
'src/tools/swarming_client':
Var('git_url') + '/external/swarming.client.git@ae8085b09e6162b4ec869e430d7d09c16b32b433',
'src/v8':
- Var('git_url') + '/external/v8.git@af6f699b0be532b73bc2f6c9e1cf40a57fa7e234',
+ Var('git_url') + '/external/v8.git@f41aacf603a5e8fbdf9c854aa7fdb23bece6c267',
}
deps_os = {
'android':
{
+ 'src/pdf':
+ None,
'src/third_party/android_tools':
Var('git_url') + '/android_tools.git@bf45c76e0eb23b7b7a9d5f26b28c16983daa173b',
'src/third_party/aosp':
@@ -211,8 +225,12 @@ deps_os = {
None,
'src/native_client/src/third_party/ppapi':
None,
+ 'src/pdf':
+ None,
'src/testing/iossim/third_party/class-dump':
Var('git_url') + '/chromium/deps/class-dump.git@89bd40883c767584240b4dade8b74e6f57b9bdab',
+ 'src/third_party/WebKit':
+ None,
'src/third_party/WebKit/LayoutTests/w3c/csswg-test':
None,
'src/third_party/WebKit/LayoutTests/w3c/web-platform-tests':
@@ -297,7 +315,7 @@ deps_os = {
'src/chrome/installer/mac/third_party/xz/xz':
Var('git_url') + '/chromium/deps/xz.git@eecaf55632ca72e90eb2641376bce7cdbc7284f7',
'src/chrome/tools/test/reference_build/chrome_mac':
- Var('git_url') + '/chromium/reference_builds/chrome_mac.git@78cf441c4ed0727b7bdadd63818e529898c3e4dd',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/google_toolbox_for_mac/src':
Var('git_url') + '/external/google-toolbox-for-mac.git@704fb56df6a9a0884801045a158e021945d9d991',
'src/third_party/lighttpd':
@@ -311,12 +329,16 @@ deps_os = {
},
'unix':
{
+ 'build/third_party/cbuildbot_chromite':
+ Var('git_url') + '/chromiumos/chromite.git@004471a95329dd59ada2d64f5c0e1331aa734b23',
+ 'build/third_party/xvfb':
+ Var('git_url') + '/chromium/tools/third_party/xvfb.git@aebb1aadf1422e4d81e831e13746b8f7ae322e07',
'src/chrome/tools/test/reference_build/chrome_linux':
- Var('git_url') + '/chromium/reference_builds/chrome_linux64.git@5186d1b279358de0d9a581399281f2268932cd37',
+ Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa',
'src/third_party/chromite':
Var('git_url') + '/chromiumos/chromite.git@63193a4393f6e964bfca992bfb03e40183554f7d',
'src/third_party/cros_system_api':
- Var('git_url') + '/chromiumos/platform/system_api.git@826b4567a5f3b01e2f52022759990dac56c14ea6',
+ Var('git_url') + '/chromiumos/platform/system_api.git@5b855c05cbbd9d4dcd7430fa58e73a296d038047',
'src/third_party/fontconfig/src':
Var('git_url') + '/external/fontconfig.git@f16c3118e25546c1b749f9823c51827a60aeb5c1',
'src/third_party/freetype2/src':
@@ -337,7 +359,7 @@ deps_os = {
'win':
{
'src/chrome/tools/test/reference_build/chrome_win':
- Var('git_url') + '/chromium/reference_builds/chrome_win.git@126d11ec7462975e6f073214929fca0f3c54756e',
+ 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':
@@ -355,7 +377,7 @@ deps_os = {
'src/third_party/nss':
Var('git_url') + '/chromium/deps/nss.git@b94fa6ec8c1be165a514ea05ff380996c2cbdeb6',
'src/third_party/pefile':
- Var('git_url') + '/external/pefile.git@1ceaa279daa62b71e3431e58f68be6a96dd1519a',
+ Var('git_url') + '/external/pefile.git@72c6ae42396cb913bcab63c15585dc3b5c3f92f1',
'src/third_party/perl':
Var('git_url') + '/chromium/deps/perl.git@ac0d98b5cee6c024b0cffeb4f8f45b6fc5ccdb78',
'src/third_party/psyco_win32':