diff options
| -rw-r--r-- | .DEPS.git | 59 | ||||
| -rw-r--r-- | DEPS | 670 |
2 files changed, 273 insertions, 456 deletions
@@ -1,19 +1,32 @@ -# 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': - '@7a3e3e733f14ea1ee6527a88bc07ff212eb76322' + '@8f3c3a56c6e33ea87be802a5ecbb84e3dfaac982', + 'angle_revision': + '636d19e9cd371ee991bbfa11643c648c9da89225' } deps = { + 'build': + Var('git_url') + '/chromium/tools/build.git@0f9cf75d3a0760402e96eb4e30c6e888a44f1c65', + 'chromeos': + Var('git_url') + '/chromium/src.git@93d529cafc6423e431a88612dff69d06d4f0759f', + 'src': + Var('git_url') + '/chromium/src.git@ec53022c4d44a5fabbecb3409737381b63edb0dd', 'src/breakpad/src': - Var('git_url') + '/external/google-breakpad/src.git@513b1e5a04c1e29b41855e092de2c1ff4860a693', + Var('git_url') + '/external/google-breakpad/src.git@70c3f5d304bfde6494c140aecbc329dd566a5a7d', 'src/build/util/support': Var('git_url') + '/chromium/support.git@9306628dc48b26b6264fc32a09bd5f926fec7218', + 'src/chrome/browser/resources/software_rendering_list': + Var('git_url') + '/chromium/deps/gpu/software_rendering_list.git@5c486a4e41965789dcb25190502ddd815afd73f9', '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': @@ -21,7 +34,7 @@ deps = { 'src/googleurl': Var('git_url') + '/external/google-url.git@290665e5ec3f648c6d94f0a4e2d0f1c603f65b84', 'src/native_client': - Var('git_url') + '/native_client/src/native_client.git@bf121d5d1aeb2c63779a8a54689f5589f01af980', + Var('git_url') + '/native_client/src/native_client.git@e01979743f7327660e983658505cadc2d4a5966b', 'src/sdch/open-vcdiff': Var('git_url') + '/external/open-vcdiff.git@64fe2324403ea78dbd781073f4e5b34768676e2c', 'src/seccompsandbox': @@ -31,15 +44,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@ade79b8f746e42d8730924e4d96eba0401afc7de', + 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@b638a24e0215731f1c0c3bd2c77f110f49a11305', 'src/third_party/ffmpeg': - Var('git_url') + '/chromium/deps/ffmpeg/source.git@e8ac1facccc87c64fb1863b00a170bab9deea4cd', + Var('git_url') + '/chromium/deps/ffmpeg/source.git@0edb2b126dcae90730e450afdeb0eec0112ce84b', 'src/third_party/flac': Var('git_url') + '/chromium/deps/flac.git@1cde08e295604898d14367eda0414ade8121ec43', 'src/third_party/hunspell': @@ -85,9 +98,9 @@ deps = { 'src/third_party/swig/Lib': Var('git_url') + '/chromium/deps/swig/Lib.git@549f0b084ad9c40ef42d111303d831eb8d91252e', 'src/third_party/v8-i18n': - Var('git_url') + '/external/v8-i18n.git@8b6c2f831db1ac1420f088c83b0393077fb99b9a', + Var('git_url') + '/external/v8-i18n.git@a7613b045cd4a1172348cff8a2a49d43995bb283', 'src/third_party/webdriver/python/selenium': - Var('git_url') + '/external/selenium/py/selenium.git@cefac3ebde838c842521ab8d0ff2540a42ecb82f', + Var('git_url') + '/external/selenium/py.git@43dd2f3b684a129cdaf84e4e4e0656e2d7852a4c', 'src/third_party/webgl_conformance': Var('git_url') + '/chromium/deps/webgl/sdk/tests.git@610d3f4a4dc6a233bd95bc50cbc36174150866ee', 'src/third_party/webrtc': @@ -101,7 +114,7 @@ deps = { 'src/tools/page_cycler/acid3': Var('git_url') + '/chromium/deps/acid3.git@633fc66cc99ae5bb92b567c6beafde7a01cfdb49', 'src/v8': - Var('git_url') + '/external/v8/3.6.git@ee0e6d1ff114d6f139499a64df306f661682f767', + Var('git_url') + '/external/v8.git@8f41c6e8752d5aa09d3866fd8793a589381103d3', } deps_os = { @@ -110,7 +123,7 @@ 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@370bfbfa0a7f3177da752965cd63d3b377d742fb', 'src/third_party/lighttpd': @@ -125,7 +138,11 @@ 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/chromiumos/platform/cros.git@b48469c4', + 'src/third_party/cros_system_api': + 'http://git.chromium.org/chromiumos/platform/system_api.git@8152d9bd', 'src/third_party/lss': Var('git_url') + '/external/linux-syscall-support/lss.git@92bafa4c45f03a440868c5e2f066ef61e6f4c517', 'src/third_party/openssl': @@ -138,15 +155,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@9e6b5c3990e1c24f19cff445362d0a2d5ee2bd2f', '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@8c079a1f740562eaf5986ce7bbe887de5a0351ad', + Var('git_url') + '/chromium/deps/ffmpeg/binaries/win.git@8e77945c998b1899c30bb1ea6fbf2973017af00e', 'src/third_party/lighttpd': Var('git_url') + '/chromium/deps/lighttpd.git@856e79c6109d4f0abe93c01d4c22419e33c9bee7', 'src/third_party/mingw-w64/mingw/bin': @@ -198,17 +215,17 @@ hooks = [ 'python', 'src/build/download_nacl_toolchains.py', '--x86-version', - '6757', + '6941', '--nacl-newlib-only', '--file-hash', 'mac_x86_newlib', - '280ecee659ff804d5eeca8964c31545b0d68d9c8', + 'da76f48d57b1e579e2a2e65fdfd9c03136b46e24', '--file-hash', 'win_x86_newlib', - '7730f4515c745c0c012df4a1080be9a46ffcda47', + 'b6318df6af3e6bda15c8bf8aa373bb4fd1b6bd63', '--file-hash', 'linux_x86_newlib', - '596aa5b812ec4b24160ed7ce55b3fd141f929fbf' + 'd1001bba03ab37a7aab3c295da5660c5b7c45a98' ], 'pattern': '.' @@ -1,443 +1,243 @@ -vars = { - # Use this googlecode_url variable only if there is an internal mirror for it. - # If you do not know, use the full path while defining your new deps entry. - "googlecode_url": "http://%s.googlecode.com/svn", - "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "97678", - "chromium_git": "http://git.chromium.org/git", - "swig_revision": "69281", - "nacl_revision": "6941", - # After changing nacl_revision, run 'glient sync' and check native_client/DEPS - # to update other nacl_*_revision's. - # TODO(brettw) We should use the "From" syntax to avoid hardcoding the - # revisions here, but it makes checkdeps confused. We should fix checkdeps. - "nacl_tools_revision": "6504", # native_client/DEPS: tools_rev +# +# To use this DEPS file to re-create a Chromium release you +# need the tools from http://dev.chromium.org installed. +# +# This DEPS file corresponds to Chromium 16.0.912.55 +# +# +# +vars = {'webkit_trunk': 'http://svn.webkit.org/repository/webkit/trunk'} - # These hashes need to be updated when nacl_toolchain_revision is changed. - # After changing nacl_toolchain_revision, run 'gclient runhooks' to get the - # new values. - "nacl_toolchain_mac_x86_newlib_hash": - "280ecee659ff804d5eeca8964c31545b0d68d9c8", - "nacl_toolchain_win_x86_newlib_hash": - "7730f4515c745c0c012df4a1080be9a46ffcda47", - "nacl_toolchain_linux_x86_newlib_hash": - "596aa5b812ec4b24160ed7ce55b3fd141f929fbf", - "nacl_toolchain_revision": "6757", - - "libjingle_revision": "88", - "libvpx_revision": "103347", - "ffmpeg_revision": "106016", - "sfntly_revision": "98", - "skia_revision": "2480", - "v8_revision": "9637", - "webrtc_revision": "711", - - # Note: On most bots, clang is not checked out via DEPS but by - # tools/clang/scripts/update.sh. The script reads this line here. - # Do NOT CHANGE this if you don't know what you're doing -- see - # http://code.google.com/p/chromium/wiki/UpdatingClang - "clang_revision": "142072", +deps_os = { + 'win': { + 'src/third_party/yasm/binaries': + '/trunk/deps/third_party/yasm/binaries@74228', + 'src/third_party/pefile': + 'http://pefile.googlecode.com/svn/trunk@63', + 'src/third_party/swig/win': + '/trunk/deps/third_party/swig/win@69281', + 'src/third_party/lighttpd': + '/trunk/deps/third_party/lighttpd@33727', + 'src/chrome/tools/test/reference_build/chrome_win': + '/trunk/deps/reference_builds/chrome_win@89574', + 'src/rlz': + 'http://rlz.googlecode.com/svn/trunk@49', + 'src/third_party/xulrunner-sdk': + '/trunk/deps/third_party/xulrunner-sdk@71609', + 'src/third_party/ffmpeg/binaries/chromium/win/ia32': + '/trunk/deps/third_party/ffmpeg/binaries/win@108357', + 'src/third_party/psyco_win32': + '/trunk/deps/third_party/psyco_win32@79861', + 'src/third_party/mingw-w64/mingw/bin': + 'http://src.chromium.org/native_client/trunk/src/third_party/mingw-w64/mingw/bin@6504', + 'src/chrome_frame/tools/test/reference_build/chrome_win': + '/trunk/deps/reference_builds/chrome_win@89574', + 'src/third_party/cygwin': + '/trunk/deps/third_party/cygwin@66844', + 'src/third_party/python_26': + '/trunk/tools/third_party/python_26@89111', + 'src/third_party/syzygy/binaries': + 'http://sawbuck.googlecode.com/svn/trunk/syzygy/binaries@427', + 'src/third_party/nss': + '/trunk/deps/third_party/nss@106031', + }, + 'mac': { + 'src/third_party/WebKit/WebKitLibraries': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/WebKitLibraries@101137', + 'src/third_party/GTM': + 'http://google-toolbox-for-mac.googlecode.com/svn/trunk@459', + 'src/third_party/pdfsqueeze': + 'http://pdfsqueeze.googlecode.com/svn/trunk@4', + 'src/chrome/installer/mac/third_party/xz/xz': + '/trunk/deps/third_party/xz@87706', + 'src/third_party/swig/mac': + '/trunk/deps/third_party/swig/mac@69281', + 'src/chrome/tools/test/reference_build/chrome_mac': + '/trunk/deps/reference_builds/chrome_mac@89574', + 'src/third_party/lighttpd': + '/trunk/deps/third_party/lighttpd@33737', + 'src/third_party/nss': + '/trunk/deps/third_party/nss@106031', + }, + 'unix': { + 'src/third_party/cros_system_api': + 'http://git.chromium.org/chromiumos/platform/system_api.git@8152d9bd', + 'src/third_party/openssl': + '/trunk/deps/third_party/openssl@101988', + 'src/third_party/WebKit/Tools/gdb': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/Tools/gdb@101137', + 'src/chrome/tools/test/reference_build/chrome_linux': + '/trunk/deps/reference_builds/chrome_linux@89574', + 'src/third_party/swig/linux': + '/trunk/deps/third_party/swig/linux@69281', + 'src/third_party/cros': + 'http://git.chromium.org/chromiumos/platform/cros.git@b48469c4', + 'src/third_party/xdg-utils': + '/trunk/deps/third_party/xdg-utils@93299', + 'src/third_party/lss': + 'http://linux-syscall-support.googlecode.com/svn/trunk/lss@8', + }, } deps = { - "src/breakpad/src": - (Var("googlecode_url") % "google-breakpad") + "/trunk/src@865", - - "src/build/util/support": - "/trunk/deps/support@20411", - - "src/googleurl": - (Var("googlecode_url") % "google-url") + "/trunk@159", - - "src/seccompsandbox": - (Var("googlecode_url") % "seccompsandbox") + "/trunk@170", - - "src/sdch/open-vcdiff": - (Var("googlecode_url") % "open-vcdiff") + "/trunk@40", - - "src/testing/gtest": - (Var("googlecode_url") % "googletest") + "/trunk@560", - - "src/testing/gmock": - (Var("googlecode_url") % "googlemock") + "/trunk@374", - - "src/third_party/angle": - (Var("googlecode_url") % "angleproject") + "/trunk@785", - - # Note that this is *not* where we check out WebKit -- this just - # puts some extra files into place for the real WebKit checkout to - # happen. See lines mentioning "webkit_revision" for the real - # WebKit checkout. - "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@76115", - - "src/third_party/icu": - "/trunk/deps/third_party/icu46@101184", - - "src/third_party/hunspell": - "/trunk/deps/third_party/hunspell@96723", - - "src/third_party/hunspell_dictionaries": - "/trunk/deps/third_party/hunspell_dictionaries@79099", - - "src/third_party/safe_browsing/testing": - (Var("googlecode_url") % "google-safe-browsing") + "/trunk/testing@106", - - "src/third_party/cacheinvalidation/files/src/google": - (Var("googlecode_url") % "google-cache-invalidation-api") + - "/trunk/src/google@143", - - "src/third_party/leveldatabase/src": - (Var("googlecode_url") % "leveldb") + "/trunk@53", - - "src/third_party/snappy/src": - (Var("googlecode_url") % "snappy") + "/trunk@37", - - "src/tools/grit": - (Var("googlecode_url") % "grit-i18n") + "/trunk@6", - - "src/tools/gyp": - (Var("googlecode_url") % "gyp") + "/trunk@1075", - - "src/v8": - (Var("googlecode_url") % "v8") + "/branches/3.6@" + Var("v8_revision"), - - "src/native_client": - Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"), - - "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin": - Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" + - Var("nacl_revision"), - - "src/third_party/sfntly/src/sfntly": - (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src/sfntly@" + - Var("sfntly_revision"), - - "src/third_party/skia/src": - (Var("googlecode_url") % "skia") + "/trunk/src@" + Var("skia_revision"), - - "src/third_party/skia/include": - (Var("googlecode_url") % "skia") + "/trunk/include@" + Var("skia_revision"), - - "src/third_party/skia/third_party/glu": - (Var("googlecode_url") % "skia") + "/trunk/third_party/glu@" + Var("skia_revision"), - - "src/third_party/WebKit/LayoutTests": - Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"), - - "src/third_party/WebKit/Source": - Var("webkit_trunk") + "/Source@" + Var("webkit_revision"), - - "src/third_party/WebKit/Tools/DumpRenderTree": - Var("webkit_trunk") + "/Tools/DumpRenderTree@" + Var("webkit_revision"), - - "src/third_party/WebKit/Tools/Scripts": - Var("webkit_trunk") + "/Tools/Scripts@" + Var("webkit_revision"), - - "src/third_party/WebKit/Tools/TestWebKitAPI": - Var("webkit_trunk") + "/Tools/TestWebKitAPI@" + Var("webkit_revision"), - - "src/third_party/ots": - (Var("googlecode_url") % "ots") + "/trunk@74", - - "src/tools/page_cycler/acid3": - "/trunk/deps/page_cycler/acid3@102714", - - "src/chrome/test/data/perf/frame_rate/content": - "/trunk/deps/frame_rate/content@93671", - - "src/third_party/bidichecker": - (Var("googlecode_url") % "bidichecker") + "/trunk/lib@4", - - "src/third_party/v8-i18n": - (Var("googlecode_url") % "v8-i18n") + "/trunk@4", - - "src/third_party/webgl_conformance": - "/trunk/deps/third_party/webgl/sdk/tests@93490", - - # We run these layout tests as UI tests. Since many of the buildbots that - # run layout tests do NOT have access to the LayoutTest directory, we need - # to map them here. In practice, these do not take up much space. - "src/chrome/test/data/layout_tests/LayoutTests/fast/events": - Var("webkit_trunk") + "/LayoutTests/fast/events@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/fast/js/resources": - Var("webkit_trunk") + "/LayoutTests/fast/js/resources@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/fast/workers": - Var("webkit_trunk") + "/LayoutTests/fast/workers@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/http/tests/resources": - Var("webkit_trunk") + "/LayoutTests/http/tests/resources@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/http/tests/workers": - Var("webkit_trunk") + "/LayoutTests/http/tests/workers@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest": - Var("webkit_trunk") + "/LayoutTests/http/tests/xmlhttprequest@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/http/tests/websocket/tests": - Var("webkit_trunk") + "/LayoutTests/http/tests/websocket/tests@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium/fast/workers": - Var("webkit_trunk") + "/LayoutTests/platform/chromium/fast/workers@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-cg-mac/fast/events": - Var("webkit_trunk") + "/LayoutTests/platform/chromium-cg-mac/fast/events@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-cg-mac/http/tests/workers": - Var("webkit_trunk") + "/LayoutTests/platform/chromium-cg-mac/http/tests/workers@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-cg-mac/storage/domstorage": - Var("webkit_trunk") + "/LayoutTests/platform/chromium-cg-mac/storage/domstorage@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/events": - Var("webkit_trunk") + "/LayoutTests/platform/chromium-win/fast/events@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/workers": - Var("webkit_trunk") + "/LayoutTests/platform/chromium-win/fast/workers@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/http/tests/appcache": - Var("webkit_trunk") + "/LayoutTests/http/tests/appcache@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/http/tests/workers": - Var("webkit_trunk") + "/LayoutTests/platform/chromium-win/http/tests/workers@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/storage/domstorage": - Var("webkit_trunk") + "/LayoutTests/platform/chromium-win/storage/domstorage@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/storage/domstorage": - Var("webkit_trunk") + "/LayoutTests/storage/domstorage@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/media": - Var("webkit_trunk") + "/LayoutTests/media@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/fast/filesystem/workers": - Var("webkit_trunk") + "/LayoutTests/fast/filesystem/workers@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/fast/filesystem/resources": - Var("webkit_trunk") + "/LayoutTests/fast/filesystem/resources@" + - Var("webkit_revision"), - "src/chrome/test/data/layout_tests/LayoutTests/http/tests/filesystem": - Var("webkit_trunk") + "/LayoutTests/http/tests/filesystem@" + - Var("webkit_revision"), - - "src/third_party/swig/Lib": - "/trunk/deps/third_party/swig/Lib@" + Var("swig_revision"), - - # WebDriver keeps client and test code separate, and merges when the - # python egg is installed. We run tests directly from src, so import - # the code into the structure expected by the tests. - # Make sure you update chrome/test/functional.DEPS/DEPS too. - "src/third_party/webdriver/python/selenium": - "http://selenium.googlecode.com/svn/trunk/py/selenium@13487", - "src/third_party/webdriver/python/selenium/test": - "http://selenium.googlecode.com/svn/trunk/py/test@13487", - - "src/third_party/libvpx": - "/trunk/deps/third_party/libvpx@" + - Var("libvpx_revision"), - - "src/third_party/ffmpeg": - "/trunk/deps/third_party/ffmpeg/source@" + - Var("ffmpeg_revision"), - - "src/third_party/libjingle/source": - (Var("googlecode_url") % "libjingle") + "/trunk@" + - Var("libjingle_revision"), - - "src/third_party/speex": - "/trunk/deps/third_party/speex@83190", - - "src/third_party/yasm/source/patched-yasm": - "/trunk/deps/third_party/yasm/patched-yasm@73761", - - "src/third_party/libjpeg_turbo": - "/trunk/deps/third_party/libjpeg_turbo@105131", - - "src/third_party/flac": - "/trunk/deps/third_party/flac@96404", - - "src/third_party/pyftpdlib/src": - (Var("googlecode_url") % "pyftpdlib") + "/trunk@888", - - # Needed to support nacl browser test jig. - "src/third_party/pylib": - # TODO(brettw) enable the From() line instead when checkdeps is fixed. - #From("src/native_client", "native_client/src/third_party/pylib"), - Var("nacl_trunk") + "/src/third_party/pylib@" + Var("nacl_tools_revision"), - "src/third_party/scons-2.0.1": - Var("nacl_trunk") + "/src/third_party/scons-2.0.1@" + - Var("nacl_tools_revision"), - - "src/third_party/webrtc": - (Var("googlecode_url") % "webrtc") + "/trunk/src@" + Var("webrtc_revision"), - - "src/third_party/mozc/session": - (Var("googlecode_url") % "mozc") + "/trunk/src/session@58", - - "src/third_party/smhasher/src": - (Var("googlecode_url") % "smhasher") + "/trunk@136", -} - - -deps_os = { - "win": { - "src/chrome/tools/test/reference_build/chrome_win": - "/trunk/deps/reference_builds/chrome_win@89574", - - "src/third_party/cygwin": - "/trunk/deps/third_party/cygwin@66844", - - "src/third_party/python_26": - "/trunk/tools/third_party/python_26@89111", - - "src/third_party/psyco_win32": - "/trunk/deps/third_party/psyco_win32@79861", - - "src/third_party/lighttpd": - "/trunk/deps/third_party/lighttpd@33727", - - "src/third_party/ffmpeg/binaries/chromium/win/ia32": - "/trunk/deps/third_party/ffmpeg/binaries/win@" + Var("ffmpeg_revision"), - - # Chrome Frame related deps - "src/third_party/xulrunner-sdk": - "/trunk/deps/third_party/xulrunner-sdk@71609", - "src/chrome_frame/tools/test/reference_build/chrome_win": - "/trunk/deps/reference_builds/chrome_win@89574", - - # Parses Windows PE/COFF executable format. - "src/third_party/pefile": - (Var("googlecode_url") % "pefile") + "/trunk@63", - - # NSS, for SSLClientSocketNSS. - "src/third_party/nss": - "/trunk/deps/third_party/nss@106031", - - "src/third_party/swig/win": - "/trunk/deps/third_party/swig/win@" + Var("swig_revision"), - - "src/third_party/mingw-w64/mingw/bin": - (Var("nacl_trunk") + "/src/third_party/mingw-w64/mingw/bin@" + - Var("nacl_tools_revision")), - - "src/rlz": - (Var("googlecode_url") % "rlz") + "/trunk@49", - - # Dependencies used by libjpeg-turbo - "src/third_party/yasm/binaries": - "/trunk/deps/third_party/yasm/binaries@74228", - - # 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@427", - }, - "mac": { - "src/chrome/tools/test/reference_build/chrome_mac": - "/trunk/deps/reference_builds/chrome_mac@89574", - - "src/third_party/GTM": - (Var("googlecode_url") % "google-toolbox-for-mac") + "/trunk@459", - "src/third_party/pdfsqueeze": - (Var("googlecode_url") % "pdfsqueeze") + "/trunk@4", - "src/third_party/lighttpd": - "/trunk/deps/third_party/lighttpd@33737", - - "src/third_party/WebKit/WebKitLibraries": - Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"), - - "src/third_party/swig/mac": - "/trunk/deps/third_party/swig/mac@" + Var("swig_revision"), - - # NSS, for SSLClientSocketNSS. - "src/third_party/nss": - "/trunk/deps/third_party/nss@106031", - - "src/chrome/installer/mac/third_party/xz/xz": - "/trunk/deps/third_party/xz@87706", - }, - "unix": { - # Linux, really. - "src/chrome/tools/test/reference_build/chrome_linux": - "/trunk/deps/reference_builds/chrome_linux@89574", - - "src/third_party/xdg-utils": - "/trunk/deps/third_party/xdg-utils@93299", - - "src/third_party/swig/linux": - "/trunk/deps/third_party/swig/linux@" + Var("swig_revision"), - - "src/third_party/lss": - (Var("googlecode_url") % "linux-syscall-support") + "/trunk/lss@8", - - "src/third_party/openssl": - "/trunk/deps/third_party/openssl@101988", - - "src/third_party/WebKit/Tools/gdb": - Var("webkit_trunk") + "/Tools/gdb@" + Var("webkit_revision"), - }, + 'src/native_client': + 'http://src.chromium.org/native_client/branches/912/src/native_client@7016', + 'src/third_party/skia/include': + 'http://skia.googlecode.com/svn/trunk/include@2480', + 'src/third_party/flac': + '/trunk/deps/third_party/flac@96404', + 'src/chrome/test/data/layout_tests/LayoutTests/fast/workers': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/fast/workers@101137', + 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/http/tests/xmlhttprequest@101137', + 'src/third_party/sfntly/src/sfntly': + 'http://sfntly.googlecode.com/svn/trunk/cpp/src/sfntly@98', + 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-cg-mac/storage/domstorage': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/platform/chromium-cg-mac/storage/domstorage@101137', + 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium/fast/workers': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/platform/chromium/fast/workers@101137', + 'src/third_party/webdriver/python/selenium/test': + 'http://selenium.googlecode.com/svn/trunk/py/test@13487', + 'src/chrome/test/data/layout_tests/LayoutTests/fast/js/resources': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/fast/js/resources@101137', + 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/resources': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/http/tests/resources@101137', + 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/filesystem': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/http/tests/filesystem@101137', + 'src/third_party/safe_browsing/testing': + 'http://google-safe-browsing.googlecode.com/svn/trunk/testing@106', + 'src/third_party/pyftpdlib/src': + 'http://pyftpdlib.googlecode.com/svn/trunk@888', + 'src/third_party/WebKit': + '/trunk/deps/third_party/WebKit@76115', + 'chromeos': + '/trunk/src/tools/cros.DEPS@105204', + 'src/chrome/test/data/layout_tests/LayoutTests/fast/events': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/fast/events@101137', + 'src/third_party/bidichecker': + 'http://bidichecker.googlecode.com/svn/trunk/lib@4', + 'src/third_party/ots': + 'http://ots.googlecode.com/svn/trunk@74', + 'src/third_party/WebKit/Source': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/Source@101137', + 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/workers': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/http/tests/workers@101137', + 'src/testing/gmock': + 'http://googlemock.googlecode.com/svn/trunk@374', + 'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin': + 'http://src.chromium.org/native_client/trunk/src/native_client/tests/prebuilt@6941', + 'src/third_party/smhasher/src': + 'http://smhasher.googlecode.com/svn/trunk@136', + 'src/chrome/test/data/layout_tests/LayoutTests/fast/filesystem/workers': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/fast/filesystem/workers@101137', + 'src/third_party/leveldatabase/src': + 'http://leveldb.googlecode.com/svn/trunk@53', + 'src/third_party/mozc/session': + 'http://mozc.googlecode.com/svn/trunk/src/session@58', + 'src/tools/gyp': + 'http://gyp.googlecode.com/svn/trunk@1075', + 'src/sdch/open-vcdiff': + 'http://open-vcdiff.googlecode.com/svn/trunk@40', + 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/storage/domstorage': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/platform/chromium-win/storage/domstorage@101137', + 'src/tools/page_cycler/acid3': + '/trunk/deps/page_cycler/acid3@102714', + 'src/chrome/test/data/layout_tests/LayoutTests/fast/filesystem/resources': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/fast/filesystem/resources@101137', + 'src/build/util/support': + '/trunk/deps/support@20411', + 'src/third_party/libjingle/source': + 'http://libjingle.googlecode.com/svn/trunk@88', + 'src': + '/branches/912/src@111847', + 'src/third_party/WebKit/Tools/DumpRenderTree': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/Tools/DumpRenderTree@101137', + 'src/chrome/browser/resources/software_rendering_list': + '/trunk/deps/gpu/software_rendering_list@111394', + 'src/third_party/hunspell': + '/trunk/deps/third_party/hunspell@96723', + 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/appcache': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/http/tests/appcache@101137', + 'src/testing/gtest': + 'http://googletest.googlecode.com/svn/trunk@560', + 'src/v8': + 'http://v8.googlecode.com/svn/branches/3.6@9982', + 'src/third_party/libvpx': + '/trunk/deps/third_party/libvpx@103347', + 'src/third_party/skia/third_party/glu': + 'http://skia.googlecode.com/svn/trunk/third_party/glu@2480', + 'src/breakpad/src': + 'http://google-breakpad.googlecode.com/svn/trunk/src@875', + 'src/third_party/v8-i18n': + 'http://v8-i18n.googlecode.com/svn/trunk@7', + 'src/chrome/test/data/perf/frame_rate/content': + '/trunk/deps/frame_rate/content@93671', + 'src/googleurl': + 'http://google-url.googlecode.com/svn/trunk@159', + 'src/third_party/webgl_conformance': + '/trunk/deps/third_party/webgl/sdk/tests@93490', + 'src/third_party/hunspell_dictionaries': + '/trunk/deps/third_party/hunspell_dictionaries@79099', + 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/events': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/platform/chromium-win/fast/events@101137', + 'src/third_party/scons-2.0.1': + 'http://src.chromium.org/native_client/trunk/src/third_party/scons-2.0.1@6504', + 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-cg-mac/fast/events': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/platform/chromium-cg-mac/fast/events@101137', + 'src/third_party/webdriver/python/selenium': + 'http://selenium.googlecode.com/svn/trunk/py/selenium@13487', + 'src/third_party/pylib': + 'http://src.chromium.org/native_client/trunk/src/third_party/pylib@6504', + 'src/third_party/WebKit/LayoutTests': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests@101137', + 'src/third_party/snappy/src': + 'http://snappy.googlecode.com/svn/trunk@37', + 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/websocket/tests': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/http/tests/websocket/tests@101137', + 'src/third_party/webrtc': + 'http://webrtc.googlecode.com/svn/trunk/src@711', + 'src/chrome/test/data/layout_tests/LayoutTests/media': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/media@101137', + 'src/third_party/libjpeg_turbo': + '/trunk/deps/third_party/libjpeg_turbo@105131', + 'src/third_party/skia/src': + 'http://skia.googlecode.com/svn/trunk/src@2480', + 'build': + '/trunk/tools/build@109845', + 'src/third_party/ffmpeg': + '/trunk/deps/third_party/ffmpeg/source@107826', + 'src/third_party/cacheinvalidation/files/src/google': + 'http://google-cache-invalidation-api.googlecode.com/svn/trunk/src/google@143', + 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/workers': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/platform/chromium-win/fast/workers@101137', + 'src/third_party/WebKit/Tools/Scripts': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/Tools/Scripts@101137', + 'src/chrome/test/data/layout_tests/LayoutTests/storage/domstorage': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/storage/domstorage@101137', + 'src/third_party/icu': + '/trunk/deps/third_party/icu46@101184', + 'src/third_party/speex': + '/trunk/deps/third_party/speex@83190', + 'src/tools/grit': + 'http://grit-i18n.googlecode.com/svn/trunk@6', + 'src/seccompsandbox': + 'http://seccompsandbox.googlecode.com/svn/trunk@170', + 'src/third_party/yasm/source/patched-yasm': + '/trunk/deps/third_party/yasm/patched-yasm@73761', + 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-cg-mac/http/tests/workers': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/platform/chromium-cg-mac/http/tests/workers@101137', + 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/http/tests/workers': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/LayoutTests/platform/chromium-win/http/tests/workers@101137', + 'src/third_party/WebKit/Tools/TestWebKitAPI': + Var("webkit_trunk")[:-6] + '/branches/chromium/912/Tools/TestWebKitAPI@101137', + 'src/third_party/angle': + 'http://angleproject.googlecode.com/svn/branches/chrome_m16@896', + 'src/third_party/swig/Lib': + '/trunk/deps/third_party/swig/Lib@69281', } +skip_child_includes = ['breakpad', 'chrome_frame', 'native_client', 'o3d', 'pdf', 'sdch', 'skia', 'testing', 'third_party', 'v8'] -include_rules = [ - # Everybody can use some things. - "+base", - "+build", - "+ipc", - - # For now, we allow ICU to be included by specifying "unicode/...", although - # this should probably change. - "+unicode", - "+testing", -] - - -# checkdeps.py shouldn't check include paths for files in these dirs: -skip_child_includes = [ - "breakpad", - "chrome_frame", - "native_client", - "o3d", - "pdf", - "sdch", - "skia", - "testing", - "third_party", - "v8", -] - +hooks = [{'action': ['python', 'src/build/download_nacl_toolchains.py', '--x86-version', '6941', '--nacl-newlib-only', '--file-hash', 'mac_x86_newlib', 'da76f48d57b1e579e2a2e65fdfd9c03136b46e24', '--file-hash', 'win_x86_newlib', 'b6318df6af3e6bda15c8bf8aa373bb4fd1b6bd63', '--file-hash', 'linux_x86_newlib', 'd1001bba03ab37a7aab3c295da5660c5b7c45a98'], 'pattern': '.'}, {'action': ['python', 'src/tools/clang/scripts/update.py', '--mac-only'], 'pattern': '.'}, {'action': ['python', 'src/build/gyp_chromium'], 'pattern': '.'}] -hooks = [ - { - # This downloads binaries for Native Client's newlib toolchain. - # Done in lieu of building the toolchain from scratch as it can take - # anywhere from 30 minutes to 4 hours depending on platform to build. - "pattern": ".", - "action": [ - "python", "src/build/download_nacl_toolchains.py", - "--x86-version", Var("nacl_toolchain_revision"), - "--nacl-newlib-only", - "--file-hash", "mac_x86_newlib", - Var("nacl_toolchain_mac_x86_newlib_hash"), - "--file-hash", "win_x86_newlib", - Var("nacl_toolchain_win_x86_newlib_hash"), - "--file-hash", "linux_x86_newlib", - Var("nacl_toolchain_linux_x86_newlib_hash"), - ], - }, - { - # 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. - "pattern": ".", - "action": ["python", "src/tools/clang/scripts/update.py", "--mac-only"], - }, - { - # A change to a .gyp, .gypi, or to GYP itself should run the generator. - "pattern": ".", - "action": ["python", "src/build/gyp_chromium"], - }, -] +include_rules = ['+base', '+build', '+ipc', '+unicode', '+testing']
\ No newline at end of file |