diff options
Diffstat (limited to '.DEPS.git')
| -rw-r--r-- | .DEPS.git | 73 |
1 files changed, 44 insertions, 29 deletions
@@ -1,27 +1,38 @@ -# DO NOT EDIT. THIS IS A GENERATED FILE. +# 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/UsingGit +# FOR HOW TO ROLL DEPS vars = { 'webkit_url': - 'http://git.chromium.org/external/WebKit_trimmed.git', + 'https://chromium.googlesource.com/chromium/blink.git', 'git_url': - 'http://git.chromium.org', + 'https://chromium.googlesource.com', 'webkit_rev': - '@b35c1f46ef09f7ae783614ec9c8ff63df2b91a10' + '@ec67e6340416194afbc56bed987847b160c38750', + 'angle_revision': + 'ae801d40b515508d6f295a4377c0f199b6649076' } deps = { + 'chromeos': + Var('git_url') + '/chromium/src.git@c155c2541dc88c972115d28be7b66b152a1bedc3', + 'src': + Var('git_url') + '/chromium/src.git@29f10a003f1bf33c41b86f4517d658d87f85c866', 'src/breakpad/src': Var('git_url') + '/external/google-breakpad/src.git@072eac01b55527ad6511c04471d9e0b2329d4471', 'src/build/util/support': Var('git_url') + '/chromium/support.git@9306628dc48b26b6264fc32a09bd5f926fec7218', '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/frame_rate/content': + Var('git_url') + '/chromium/frame_rate/content.git@c10272c88463efeef6bb19c9ec07c42bc8fe22b9', 'src/googleurl': Var('git_url') + '/external/google-url.git@290665e5ec3f648c6d94f0a4e2d0f1c603f65b84', 'src/native_client': - Var('git_url') + '/native_client/src/native_client.git@a8c1fa766747c7c3f69434e13e04f30a454ace7c', + Var('git_url') + '/native_client/src/native_client.git@8fb081433d073e8743b523e2eea47b3efaa4ef9d', 'src/native_client/src/third_party/ppapi': - Var('git_url') + '/chromium/src/ppapi.git@9c715e4b7592baa0aed34059c6b29cee21d361f6', + Var('git_url') + '/chromium/src.git@c155c2541dc88c972115d28be7b66b152a1bedc3', 'src/sdch/open-vcdiff': Var('git_url') + '/external/open-vcdiff.git@f1dd933c4e47a65889b4bba2a5f58b12aac53383', 'src/seccompsandbox': @@ -31,15 +42,15 @@ deps = { 'src/testing/gtest': Var('git_url') + '/external/googletest.git@a2965825b1953c7b8ad292f726eb5c3f2659d5d3', 'src/third_party/WebKit': - Var('webkit_url') + Var('webkit_rev'), + Var('git_url') + '/external/WebKit_trimmed.git' + Var('webkit_rev'), 'src/third_party/angle': - Var('git_url') + '/external/angleproject.git@8263a5a5ffecf167bf3518fe7246afe050481b8d', + 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/files/src/google': - Var('git_url') + '/external/google-cache-invalidation-api/src/google.git@f1ca2c36ed2e085ec64a85c9cafb041972f034d3', + Var('git_url') + '/external/google-cache-invalidation-api/src/google.git@2bd4562d201c4e0426771543ddaf4bdc16f91d6e', 'src/third_party/ffmpeg': - Var('git_url') + '/chromium/deps/ffmpeg/source.git@1e14938ad47d7e431f669fa6a3bb182433e85a7d', + Var('git_url') + '/chromium/deps/ffmpeg.git@1f249a132847a5b5853e5c2f1c41676e4eb93c80', 'src/third_party/flac': Var('git_url') + '/chromium/deps/flac.git@921080d4f74c6de2119bd3d185ba7908865a375b', 'src/third_party/hunspell': @@ -51,11 +62,11 @@ deps = { 'src/third_party/leveldb': Var('git_url') + '/external/leveldb.git@e67cd63d8a779971247078b2715b6ae7b37dbc2e', 'src/third_party/libjingle/source': - Var('git_url') + '/external/libjingle.git@100569c349b89facfcabff0d6db881ace31a05c0', + Var('git_url') + '/external/libjingle.git@d5aadf39424d736b836b375b0d634fae785caf98', 'src/third_party/libjpeg_turbo': Var('git_url') + '/chromium/deps/libjpeg_turbo.git@6eb4f2096c80f5f3286f63bb76b671eb5eb97d78', 'src/third_party/libvpx': - Var('git_url') + '/chromium/deps/libvpx.git@23e067305b541d58bccb822a279644077f613a49', + Var('git_url') + '/chromium/deps/libvpx.git@83b8622696394da4a9bde724375636fe83838d57', 'src/third_party/ots': Var('git_url') + '/external/ots.git@7f9bebe3906fb30f0632f9d010754d12dd6c02d7', 'src/third_party/pyftpdlib/src': @@ -69,13 +80,13 @@ deps = { 'src/third_party/sfntly/src/sfntly': Var('git_url') + '/external/sfntly/cpp/src/sfntly.git@0204399e64e8af636b1e9799283196a6f7ac84f6', 'src/third_party/skia/gpu': - Var('git_url') + '/external/skia/gpu.git@0b6f77c41c699e87be27ee0881c75983d128efae', + Var('git_url') + '/external/skia/gpu.git@f7a6333b0524d2f7ec66f9caca7410e6ffa9c40a', 'src/third_party/skia/include': - Var('git_url') + '/external/skia/include.git@839aeac5a1a34cb994f027a667d0c0293bb07740', + Var('git_url') + '/external/skia/include.git@5c7c35eecb7cdf76ce4c30296ed9e51f0a47fe68', 'src/third_party/skia/src': - Var('git_url') + '/external/skia/src.git@2c5c3969d2b5a93f26ae3795feb3f145a2df73a9', + Var('git_url') + '/external/skia/src.git@693db997429bf5e8a490a59b639ec8de05d26027', 'src/third_party/skia/third_party/glu': - Var('git_url') + '/external/skia/third_party/glu.git@ff7deb69dcaabf939d45fca80ad507219e938412', + Var('git_url') + '/external/skia/third_party/glu.git@6e477a46cae75b772d3131c5ba83418b9b194a23', 'src/third_party/snappy/src': Var('git_url') + '/external/snappy.git@5258607248a000affb2f72b87b9bbd044806677d', 'src/third_party/speex': @@ -83,7 +94,7 @@ deps = { 'src/third_party/swig/Lib': Var('git_url') + '/chromium/deps/swig/Lib.git@549f0b084ad9c40ef42d111303d831eb8d91252e', 'src/third_party/webdriver/python/selenium': - Var('git_url') + '/external/selenium/py/selenium.git@f531d35cf99dd456a1e52af343e738635dd755e4', + Var('git_url') + '/external/selenium/py.git@c7f9a516394e92db80a2c99f6c5ca86af3bf117b', 'src/third_party/webgl_conformance': Var('git_url') + '/chromium/deps/webgl/sdk/tests.git@610d3f4a4dc6a233bd95bc50cbc36174150866ee', 'src/third_party/webrtc': @@ -91,11 +102,11 @@ deps = { 'src/third_party/yasm/source/patched-yasm': Var('git_url') + '/chromium/deps/yasm/patched-yasm.git@44efe151b6960bab3db0c85354cc4cce1024219d', 'src/tools/gyp': - Var('git_url') + '/external/gyp.git@6377b5422801f251819bfcf4761e60a6391a8522', + Var('git_url') + '/external/gyp.git@f8a911e34031b298a02e4bd35c24d0da8eb8ac94', 'src/tools/page_cycler/acid3': Var('git_url') + '/chromium/deps/acid3.git@59c6ae4c476750845a529cd407454378ebaaa347', 'src/v8': - Var('git_url') + '/external/v8.git@84bcc559ac20fb04f806e97d28a314b20b58fd60', + Var('git_url') + '/external/v8.git@52713aabdb485f5be077a78a098770226f1f6b35', } deps_os = { @@ -104,9 +115,9 @@ deps_os = { 'src/chrome/installer/mac/third_party/xz/xz': Var('git_url') + '/chromium/deps/xz.git@604fa85cc4e214aa0f418a2596ea865c0eed7a54', 'src/chrome/tools/test/reference_build/chrome_mac': - Var('git_url') + '/chromium/reference_builds/chrome_mac.git@dde16d147a5b8d0229f8adf8eee6d180fb9f4684', + Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa', 'src/third_party/GTM': - Var('git_url') + '/external/google-toolbox-for-mac.git@a1651c0f2fef1d41fdc1e72c5688cca7e2c3a1b6', + Var('git_url') + '/external/google-toolbox-for-mac.git@370bfbfa0a7f3177da752965cd63d3b377d742fb', 'src/third_party/lighttpd': Var('git_url') + '/chromium/deps/lighttpd.git@9dfa55d15937a688a92cbf2b7a8621b0927d06eb', 'src/third_party/nss': @@ -119,7 +130,9 @@ deps_os = { 'unix': { 'src/chrome/tools/test/reference_build/chrome_linux': - Var('git_url') + '/chromium/reference_builds/chrome_linux.git@30e720f6bfd2be52c37307114b6fca8817a90562', + Var('git_url') + '/chromium/reference_builds/chrome.git@1add884151176e42ddb946b68530e61c971ee3fa', + 'src/third_party/cros': + 'http://git.chromium.org/git/cros.git@56c93050', 'src/third_party/lss': Var('git_url') + '/external/linux-syscall-support/lss.git@d4ba6b8d8c6ab24825d11d4e5b69920c41b36880', 'src/third_party/openssl': @@ -132,15 +145,15 @@ deps_os = { 'win': { 'src/chrome/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/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/rlz': - Var('git_url') + '/external/rlz.git@7a81d763b9078abeb33f5ca7c2f66ab25fb17b9d', + Var('git_url') + '/external/rlz.git@138abd5e1ba6b0a86f5096aaad690137e300d84f', 'src/third_party/cygwin': Var('git_url') + '/chromium/deps/cygwin.git@06a117a90c15174436bfa20ceebbfdf43b7eb820', 'src/third_party/ffmpeg/binaries/chromium/win/ia32': - Var('git_url') + '/chromium/deps/ffmpeg/binaries/win.git@359ff7231ad572aec02744a650d288450cb94058', + Var('git_url') + '/chromium/deps/ffmpeg.git@c3650bcd1cea6016c45e3d1ec0d732e6f591b7b8', 'src/third_party/lighttpd': Var('git_url') + '/chromium/deps/lighttpd.git@856e79c6109d4f0abe93c01d4c22419e33c9bee7', 'src/third_party/mingw-w64/mingw/bin': @@ -198,14 +211,16 @@ hooks = [ [ 'python', 'src/build/download_nacl_irt.py', + '--base_url', + 'http://commondatastorage.googleapis.com/nativeclient-archive2/irt/branches/m14', '--nacl_revision', - '6201', + '6297', '--file_hash', 'x86_32', - 'cba52bdbdd515b026a9b0d05712879e21ec06090', + '02c4c8443656cf202562a2b9c9a63f3231fa1fbb', '--file_hash', 'x86_64', - 'cb6f14924590455d3234d8eef341426a95edf9b1' + 'caa69972df32882635a78f9212ea1d759380ab51' ], 'pattern': '.' |