From 68247baa4ae0a9dcf31b4b65d83433797fd0eece Mon Sep 17 00:00:00 2001 From: gitdeps Date: Sun, 6 Apr 2014 20:08:41 -0700 Subject: Publish DEPS for Chromium 17.0.963.45 --- .DEPS.git | 65 ++++-- DEPS | 739 ++++++++++++++++++++++---------------------------------------- 2 files changed, 307 insertions(+), 497 deletions(-) diff --git a/.DEPS.git b/.DEPS.git index 95ec1e8..8a5b0ac 100644 --- a/.DEPS.git +++ b/.DEPS.git @@ -1,15 +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': - '@0805c52a0d5e825fbb0fbc3c2e3c3bab7fa14d13' + '@7a7f218c5efc41a05d335a267236137be987d56b', + 'angle_revision': + '7065b18c5ff4c4cd4c8cb8db1fde6dc190e2340b' } deps = { + 'build': + Var('git_url') + '/chromium/tools/build.git@f2d1f467b5ed5e0de399e63ba42a8c9a095bb057', + 'build/scripts/command_wrapper/bin': + Var('git_url') + '/chromium/tools/command_wrapper/bin.git@fb746e39c73b30a8e12b0857495e3ff0832cd4b2', + 'build/scripts/gsd_generate_index': + Var('git_url') + '/chromium/tools/gsd_generate_index.git@5ece0953c2b4eebcc9011d94e41588229fc9de9b', + 'build/scripts/private/data/reliability': + Var('git_url') + '/chromium/src.git@48f85e445b0182015140038745c3896b13404b9e', + 'build/third_party/gsutil': + Var('git_url') + '/external/gsutil/src.git@3ae724bed3c59a309fa87acc7e6b745c6e555e2f', + 'build/third_party/lighttpd': + Var('git_url') + '/chromium/deps/lighttpd.git@9dfa55d15937a688a92cbf2b7a8621b0927d06eb', + 'chromeos': + Var('git_url') + '/chromium/src.git@93ebb45a57cd9cc89622dda27ed00809eee0d1d4', + 'depot_tools': + Var('git_url') + '/chromium/tools/depot_tools.git@740a6c0bd52f774cd993182b754ab93392a579db', + 'src': + Var('git_url') + '/chromium/src.git@b7494739bb77726c4fe4098ca9ca65e8559b41f9', 'src/breakpad/src': Var('git_url') + '/external/google-breakpad/src.git@8605b61bd2e1da693b7a6650b734d232ac60e85a', 'src/build/util/support': @@ -35,15 +58,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@99526f0df52b513f9a18180ae18a67847ade8516', + 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', + Var('git_url') + '/external/google-cache-invalidation-api/src/google.git@62cccf7fba419bc64fb05d0e5dbd3aefeda36d08', 'src/third_party/ffmpeg': - Var('git_url') + '/chromium/deps/ffmpeg/source.git@ee4803752a65767eaeacd8cf0eac03e0795d0e8b', + Var('git_url') + '/chromium/deps/ffmpeg/source.git@b6f1e94abee95f730bea2043dc376346262446c2', 'src/third_party/flac': Var('git_url') + '/chromium/deps/flac.git@1cde08e295604898d14367eda0414ade8121ec43', 'src/third_party/hunspell': @@ -51,7 +74,7 @@ deps = { 'src/third_party/hunspell_dictionaries': Var('git_url') + '/chromium/deps/hunspell_dictionaries.git@50fb79b30a2e3e512c88884152f26b255d0e4074', 'src/third_party/icu': - Var('git_url') + '/chromium/deps/icu46.git@3825a2325c823720fe822e8bdd079180cdb9735e', + Var('git_url') + '/chromium/deps/icu46.git@c9287557a495aad7ff3faef2ac850c85caf842c9', 'src/third_party/jsoncpp/source/include': Var('git_url') + '/external/jsoncpp/jsoncpp/include.git@e0f5afd960a964e76ef18d69d27a8c3e551baeb3', 'src/third_party/jsoncpp/source/src/lib_json': @@ -69,7 +92,7 @@ deps = { 'src/third_party/libphonenumber/src/test': Var('git_url') + '/external/libphonenumber/cpp/test.git@1a74d2ff51f3715eefad4be175456b4443a264ad', 'src/third_party/libvpx': - Var('git_url') + '/chromium/deps/libvpx.git@ff76a77415f22751105d33e49f615cae4f58b52b', + Var('git_url') + '/chromium/deps/libvpx.git@fbbac66a5815fbb67e244aee3259e3443029377c', 'src/third_party/libyuv': Var('git_url') + '/external/libyuv.git@86e9487d0dd397779f948f2ecef4b46d240ee57c', 'src/third_party/mozc/session': @@ -89,11 +112,11 @@ deps = { 'src/third_party/sfntly/src/sfntly': Var('git_url') + '/external/sfntly/cpp/src/sfntly.git@52fc22fffbdb2fada16e92e2fae715efdcb38087', 'src/third_party/skia/include': - Var('git_url') + '/external/skia/include.git@83a4806248b8c36c8e15bb36c4243e873330f0fe', + Var('git_url') + '/external/skia/include.git@d86b6f75189cb115ecbb9d122fde3ec16d03400a', 'src/third_party/skia/src': - Var('git_url') + '/external/skia/src.git@b575562fac6bbcc83c19bee8d4fbae67d5ebc4a4', + Var('git_url') + '/external/skia/src.git@b0b6f7678fbe9d04e74c7d2a8ff7b4c0d35adf49', 'src/third_party/skia/third_party/glu': - Var('git_url') + '/external/skia/third_party/glu.git@c988402115946ed3cb7fb347f6eef4a8cec543e2', + Var('git_url') + '/external/skia/third_party/glu.git@7062462fe5ffe01dbbd04c737b0e19f9e18d9a20', 'src/third_party/smhasher/src': Var('git_url') + '/external/smhasher.git@b35e562e2d80bc47a51b53ec92a305eb9a3383b4', 'src/third_party/snappy/src': @@ -119,7 +142,7 @@ deps = { 'src/tools/page_cycler/acid3': Var('git_url') + '/chromium/deps/acid3.git@633fc66cc99ae5bb92b567c6beafde7a01cfdb49', 'src/v8': - Var('git_url') + '/external/v8/3.7.git@c582d0af00ad107aa50e0fbc173f7819149cf24f', + Var('git_url') + '/external/v8.git@ea4e01f3cdc35cc06744768481c1dd2c252aeaf8', } deps_os = { @@ -128,7 +151,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': @@ -143,7 +166,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@63b0d1fd', + 'src/third_party/cros_system_api': + 'http://git.chromium.org/chromiumos/platform/system_api.git@bb265e37', 'src/third_party/lss': Var('git_url') + '/external/linux-syscall-support/lss.git@a799993a9a4c60ab8ecdff72096edcc84e764d83', 'src/third_party/openssl': @@ -156,15 +183,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@3bbd28913dc9c71bc65b133dfc2f8a19ea84ee46', + Var('git_url') + '/chromium/deps/ffmpeg/binaries/win.git@9add1b345d8ce46a4756ff0a5881a153fe650ee0', 'src/third_party/lighttpd': Var('git_url') + '/chromium/deps/lighttpd.git@856e79c6109d4f0abe93c01d4c22419e33c9bee7', 'src/third_party/mingw-w64/mingw/bin': diff --git a/DEPS b/DEPS index 2edf5fc..a461ea9 100644 --- a/DEPS +++ b/DEPS @@ -1,486 +1,269 @@ -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", - "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s", - "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "101876", - "chromium_git": "http://git.chromium.org/git", - "swig_revision": "69281", - "nacl_revision": "7362", - # After changing nacl_revision, run 'glient sync' and check native_client/DEPS - # to update other nacl_*_revision's. - "nacl_tools_revision": "7139", # 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 17.0.963.45 +# +# +# +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_linux_x86_hash": - "23f1945071467efeff373889b3ca036c10207522", - "nacl_toolchain_linux_x86_newlib_hash": - "06935bbb3ab4c55d9f6555ae54fa06e096464491", - "nacl_toolchain_mac_x86_hash": - "98da0b2c45a5ecc0a424b393e5ae6dec780940fa", - "nacl_toolchain_mac_x86_newlib_hash": - "56d82b794c3523a43068a5b69236277a96de04c5", - "nacl_toolchain_win_x86_hash": - "c5af5469b2252f3d5bb9ce4a7758b4537e9c5b16", - "nacl_toolchain_win_x86_newlib_hash": - "40d182ac25fe6623cfbe5772623c15c663a42c93", - "nacl_toolchain_revision": "7332", - - "libjingle_revision": "99", - "libphonenumber_revision": "407", - "libvpx_revision": "109236", - "lss_revision": "9", - "ffmpeg_revision": "112050", - "sfntly_revision": "111", - "skia_revision": "2785", - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling Skia - # and V8 without interference from each other. - "v8_revision": "10163", - "webrtc_revision": "1027", - "jsoncpp_revision": "246", +deps_os = { + 'win': { + 'src/third_party/yasm/binaries': + '/trunk/deps/third_party/yasm/binaries@74228', + 'src/third_party/nacl_sdk_binaries': + '/trunk/deps/third_party/nacl_sdk_binaries@111576', + '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/ffmpeg/binaries/chromium/win/ia32': + '/trunk/deps/third_party/ffmpeg/binaries/win@118948', + '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/deps/third_party/mingw-w64/mingw/bin@7139', + 'src/chrome_frame/tools/test/reference_build/chrome_win': + '/trunk/deps/reference_builds/chrome_win@89574', + 'src/third_party/xulrunner-sdk': + '/trunk/deps/third_party/xulrunner-sdk@71609', + '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@543', + 'src/third_party/nss': + '/trunk/deps/third_party/nss@112542', + }, + 'mac': { + 'src/third_party/GTM': + 'http://google-toolbox-for-mac.googlecode.com/svn/trunk@459', + 'src/third_party/swig/mac': + '/trunk/deps/third_party/swig/mac@69281', + '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/lighttpd': + '/trunk/deps/third_party/lighttpd@33737', + 'src/chrome/tools/test/reference_build/chrome_mac': + '/trunk/deps/reference_builds/chrome_mac@89574', + 'src/third_party/nss': + '/trunk/deps/third_party/nss@112542', + }, + 'unix': { + 'src/third_party/cros_system_api': + 'http://git.chromium.org/chromiumos/platform/system_api.git@bb265e37', + 'src/third_party/openssl': + '/trunk/deps/third_party/openssl@105093', + 'src/third_party/WebKit/Tools/gdb': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/Tools/gdb@105909', + '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@63b0d1fd', + '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@9', + }, } deps = { - "src/breakpad/src": - (Var("googlecode_url") % "google-breakpad") + "/trunk/src@891", - - "src/build/util/support": - "/trunk/deps/support@20411", - - "src/googleurl": - (Var("googlecode_url") % "google-url") + "/trunk@162", - - "src/seccompsandbox": - (Var("googlecode_url") % "seccompsandbox") + "/trunk@178", - - "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@889", - - # 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@113543", - - "src/third_party/hunspell": - "/trunk/deps/third_party/hunspell@110423", - - "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@151", - - "src/third_party/leveldatabase/src": - (Var("googlecode_url") % "leveldb") + "/trunk@55", - - "src/third_party/snappy/src": - (Var("googlecode_url") % "snappy") + "/trunk@37", - - "src/tools/grit": - (Var("googlecode_url") % "grit-i18n") + "/trunk@8", - - "src/tools/gyp": - (Var("googlecode_url") % "gyp") + "/trunk@1101", - - "src/v8": - (Var("googlecode_url") % "v8") + "/branches/3.7@" + Var("v8_revision"), - - "src/native_client": - Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"), - - "src/native_client_sdk/src/site_scons": - Var("nacl_trunk") + "/src/native_client/site_scons@" + Var("nacl_revision"), - - "src/third_party/pymox/src": - (Var("googlecode_url") % "pymox") + "/trunk@70", - - "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@7", - - # When roll to another webgl conformance tests revision, please goto - # chrome/test/gpu and run generate_webgl_conformance_test_list.py. - "src/third_party/webgl_conformance": - "/trunk/deps/third_party/webgl/sdk/tests@106432", - - # We should use the same software_rendering_list.json for all branches. - "src/chrome/browser/resources/software_rendering_list": - "/trunk/deps/gpu/software_rendering_list@110790", - - # 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"), - - # Make sure you update the two functional.DEPS and webdriver.DEPS too. - "src/third_party/webdriver/pylib": - "http://selenium.googlecode.com/svn/trunk/py@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@111570", - - "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@111873", - - "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": - 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/jsoncpp/source/include": - (Var("sourceforge_url") % {"repo": "jsoncpp"}) + - "/trunk/jsoncpp/include@" + Var("jsoncpp_revision"), - - "src/third_party/jsoncpp/source/src/lib_json": - (Var("sourceforge_url") % {"repo": "jsoncpp"}) + - "/trunk/jsoncpp/src/lib_json@" + Var("jsoncpp_revision"), - - "src/third_party/libyuv": - (Var("googlecode_url") % "libyuv") + "/trunk@64", - - "src/third_party/mozc/session": - (Var("googlecode_url") % "mozc") + "/trunk/src/session@58", - - "src/third_party/smhasher/src": - (Var("googlecode_url") % "smhasher") + "/trunk@136", - - "src/third_party/libphonenumber/src/phonenumbers": - (Var("googlecode_url") % "libphonenumber") + - "/trunk/cpp/src/phonenumbers@" + Var("libphonenumber_revision"), - "src/third_party/libphonenumber/src/test": - (Var("googlecode_url") % "libphonenumber") + "/trunk/cpp/test@" + - Var("libphonenumber_revision"), - "src/third_party/libphonenumber/src/resources": - (Var("googlecode_url") % "libphonenumber") + "/trunk/resources@" + - Var("libphonenumber_revision"), + 'src/third_party/skia/include': + 'http://skia.googlecode.com/svn/branches/chrome/963a/include@3083', + 'build/scripts/private/data/reliability': + '/trunk/src/chrome/test/data/reliability@109518', + '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/963/LayoutTests/fast/workers@105909', + 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests/http/tests/xmlhttprequest@105909', + 'src/third_party/sfntly/src/sfntly': + 'http://sfntly.googlecode.com/svn/trunk/cpp/src/sfntly@111', + 'build/third_party/lighttpd': + '/trunk/deps/third_party/lighttpd@58968', + 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-cg-mac/storage/domstorage': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests/platform/chromium-cg-mac/storage/domstorage@105909', + 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium/fast/workers': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests/platform/chromium/fast/workers@105909', + 'src/chrome/test/data/layout_tests/LayoutTests/fast/js/resources': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests/fast/js/resources@105909', + 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/resources': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests/http/tests/resources@105909', + 'src/third_party/libyuv': + 'http://libyuv.googlecode.com/svn/trunk@64', + 'src/chrome/test/data/layout_tests/LayoutTests/storage/domstorage': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests/storage/domstorage@105909', + 'src/third_party/libphonenumber/src/phonenumbers': + 'http://libphonenumber.googlecode.com/svn/trunk/cpp/src/phonenumbers@407', + '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@113051', + 'depot_tools': + '/trunk/tools/depot_tools@113065', + 'src/chrome/test/data/layout_tests/LayoutTests/fast/events': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests/fast/events@105909', + '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/963/Source@105909', + 'src/third_party/jsoncpp/source/src/lib_json': + 'http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/src/lib_json@246', + 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/workers': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests/http/tests/workers@105909', + 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/workers': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests/platform/chromium-win/fast/workers@105909', + '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@7362', + '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/963/LayoutTests/fast/filesystem/workers@105909', + 'src/third_party/leveldatabase/src': + 'http://leveldb.googlecode.com/svn/trunk@55', + 'src/third_party/mozc/session': + 'http://mozc.googlecode.com/svn/trunk/src/session@58', + 'src/tools/gyp': + 'http://gyp.googlecode.com/svn/trunk@1101', + '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/963/LayoutTests/platform/chromium-win/storage/domstorage@105909', + '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/963/LayoutTests/fast/filesystem/resources@105909', + 'src/third_party/jsoncpp/source/include': + 'http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@246', + 'src/build/util/support': + '/trunk/deps/support@20411', + 'src/third_party/libjingle/source': + 'http://libjingle.googlecode.com/svn/trunk@99', + 'src': + '/branches/963/src@119180', + 'src/chrome/browser/resources/software_rendering_list': + '/trunk/deps/gpu/software_rendering_list@110790', + 'src/third_party/hunspell': + '/trunk/deps/third_party/hunspell@110423', + 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/appcache': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests/http/tests/appcache@105909', + 'src/testing/gtest': + 'http://googletest.googlecode.com/svn/trunk@560', + 'src/v8': + 'http://v8.googlecode.com/svn/branches/3.7@10482', + 'src/third_party/libvpx': + '/branches/libvpx/963@117344', + 'src/third_party/skia/third_party/glu': + 'http://skia.googlecode.com/svn/branches/chrome/963a/third_party/glu@3083', + 'src/breakpad/src': + 'http://google-breakpad.googlecode.com/svn/trunk/src@891', + '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@162', + 'src/third_party/webgl_conformance': + '/trunk/deps/third_party/webgl/sdk/tests@106432', + '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/963/LayoutTests/platform/chromium-win/fast/events@105909', + 'src/third_party/scons-2.0.1': + 'http://src.chromium.org/native_client/trunk/src/third_party/scons-2.0.1@7139', + 'build/scripts/gsd_generate_index': + '/trunk/tools/gsd_generate_index@110568', + 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-cg-mac/fast/events': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests/platform/chromium-cg-mac/fast/events@105909', + 'src/third_party/WebKit/Tools/DumpRenderTree': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/Tools/DumpRenderTree@105909', + 'src/third_party/libphonenumber/src/resources': + 'http://libphonenumber.googlecode.com/svn/trunk/resources@407', + 'src/third_party/pylib': + 'http://src.chromium.org/native_client/trunk/src/third_party/pylib@7139', + 'build/third_party/gsutil': + 'http://gsutil.googlecode.com/svn/trunk/src@145', + 'src/third_party/WebKit/LayoutTests': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests@105909', + '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/963/LayoutTests/http/tests/websocket/tests@105909', + 'src/third_party/webrtc': + 'http://webrtc.googlecode.com/svn/trunk/src@1027', + 'src/chrome/test/data/layout_tests/LayoutTests/media': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests/media@105909', + 'src/third_party/libjpeg_turbo': + '/trunk/deps/third_party/libjpeg_turbo@111873', + 'src/third_party/webdriver/pylib': + 'http://selenium.googlecode.com/svn/trunk/py@13487', + 'src/third_party/skia/src': + 'http://skia.googlecode.com/svn/branches/chrome/963a/src@3084', + 'build': + '/trunk/tools/build@115909', + 'src/third_party/ffmpeg': + '/trunk/deps/third_party/ffmpeg/source@118948', + 'src/third_party/cacheinvalidation/files/src/google': + 'http://google-cache-invalidation-api.googlecode.com/svn/trunk/src/google@151', + 'src/native_client': + 'http://src.chromium.org/native_client/trunk/src/native_client@7362', + 'src/native_client_sdk/src/site_scons': + 'http://src.chromium.org/native_client/trunk/src/native_client/site_scons@7362', + 'src/third_party/libphonenumber/src/test': + 'http://libphonenumber.googlecode.com/svn/trunk/cpp/test@407', + 'src/third_party/WebKit/Tools/Scripts': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/Tools/Scripts@105909', + 'src/third_party/pymox/src': + 'http://pymox.googlecode.com/svn/trunk@70', + 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/filesystem': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests/http/tests/filesystem@105909', + 'build/scripts/command_wrapper/bin': + '/trunk/tools/command_wrapper/bin@111020', + 'src/third_party/icu': + '/trunk/deps/third_party/icu46@113544', + 'src/third_party/speex': + '/trunk/deps/third_party/speex@111570', + 'src/tools/grit': + 'http://grit-i18n.googlecode.com/svn/trunk@8', + 'src/seccompsandbox': + 'http://seccompsandbox.googlecode.com/svn/trunk@178', + '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/963/LayoutTests/platform/chromium-cg-mac/http/tests/workers@105909', + 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/http/tests/workers': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/LayoutTests/platform/chromium-win/http/tests/workers@105909', + 'src/third_party/WebKit/Tools/TestWebKitAPI': + Var("webkit_trunk")[:-6] + '/branches/chromium/963/Tools/TestWebKitAPI@105909', + 'src/third_party/angle': + 'http://angleproject.googlecode.com/svn/branches/chrome_m17@937', + 'src/third_party/swig/Lib': + '/trunk/deps/third_party/swig/Lib@69281', } +skip_child_includes = ['breakpad', 'chrome_frame', 'native_client', 'native_client_sdk', 'o3d', 'pdf', 'sdch', 'skia', 'testing', 'third_party', 'v8'] -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@112542", - - "src/third_party/swig/win": - "/trunk/deps/third_party/swig/win@" + Var("swig_revision"), - - "src/third_party/mingw-w64/mingw/bin": - (Var("nacl_trunk") + "/deps/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@543", - - # Binaries for nacl sdk. - "src/third_party/nacl_sdk_binaries": - "/trunk/deps/third_party/nacl_sdk_binaries@111576", - }, - "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/swig/mac": - "/trunk/deps/third_party/swig/mac@" + Var("swig_revision"), - - # NSS, for SSLClientSocketNSS. - "src/third_party/nss": - "/trunk/deps/third_party/nss@112542", - - "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@" + - Var("lss_revision")), - - "src/third_party/openssl": - "/trunk/deps/third_party/openssl@105093", - - "src/third_party/WebKit/Tools/gdb": - Var("webkit_trunk") + "/Tools/gdb@" + Var("webkit_revision"), - }, -} - - -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", - "native_client_sdk", - "o3d", - "pdf", - "sdch", - "skia", - "testing", - "third_party", - "v8", -] - +hooks = [{'action': ['python', 'src/build/download_nacl_toolchains.py', '--no-pnacl', '--no-arm-trusted', '--x86-version', '7332', '--file-hash', 'mac_x86_newlib', '56d82b794c3523a43068a5b69236277a96de04c5', '--file-hash', 'win_x86_newlib', '40d182ac25fe6623cfbe5772623c15c663a42c93', '--file-hash', 'linux_x86_newlib', '06935bbb3ab4c55d9f6555ae54fa06e096464491', '--file-hash', 'mac_x86', '98da0b2c45a5ecc0a424b393e5ae6dec780940fa', '--file-hash', 'win_x86', 'c5af5469b2252f3d5bb9ce4a7758b4537e9c5b16', '--file-hash', 'linux_x86', '23f1945071467efeff373889b3ca036c10207522', '--save-downloads-dir', 'src/native_client_sdk/src/build_tools/toolchain_archives'], '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", - "--no-pnacl", - "--no-arm-trusted", - "--x86-version", Var("nacl_toolchain_revision"), - "--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"), - "--file-hash", "mac_x86", - Var("nacl_toolchain_mac_x86_hash"), - "--file-hash", "win_x86", - Var("nacl_toolchain_win_x86_hash"), - "--file-hash", "linux_x86", - Var("nacl_toolchain_linux_x86_hash"), - "--save-downloads-dir", - "src/native_client_sdk/src/build_tools/toolchain_archives", - ], - }, - { - # 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 -- cgit v1.1