summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgitdeps <gitdeps@chromium.org>2014-04-04 18:40:40 -0700
committergitdeps <gitdeps@chromium.org>2014-04-04 18:40:40 -0700
commitdd4e1926e290e0c2c2447b7516a0b5ac994e466d (patch)
tree6d347c0cdbb0197af19edcb3faf68cfaf76d50d8
parent86bdab62b3b1e33b3eb1f941e54e8933d409b0ef (diff)
downloadchromium_src-14.0.835.27.zip
chromium_src-14.0.835.27.tar.gz
chromium_src-14.0.835.27.tar.bz2
Publish DEPS for Chromium 14.0.835.2714.0.835.27
-rw-r--r--.DEPS.git57
-rw-r--r--DEPS619
2 files changed, 256 insertions, 420 deletions
diff --git a/.DEPS.git b/.DEPS.git
index e420f85..15ff41b 100644
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -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'
+ '@c618154fc54d8957ea53a11cfd7e76753c20077e',
+ 'angle_revision':
+ '88dc68f684976bf68abaa1f090cfadc30138ac1f'
}
deps = {
+ 'chromeos':
+ Var('git_url') + '/chromium/src.git@c155c2541dc88c972115d28be7b66b152a1bedc3',
+ 'src':
+ Var('git_url') + '/chromium/src.git@86bdab62b3b1e33b3eb1f941e54e8933d409b0ef',
'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@0fbdbe50dd2271feec9efa9035d41055448e049b',
'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/source.git@fba034a37a7d49827a1bbf094c34c7ef00d31a7f',
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@921080d4f74c6de2119bd3d185ba7908865a375b',
'src/third_party/hunspell':
@@ -51,7 +62,7 @@ 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':
@@ -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':
@@ -95,7 +106,7 @@ deps = {
'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@ac9b544be4ac7998766f090218e8a2a0e23a2987',
}
deps_os = {
@@ -104,7 +115,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@a1651c0f2fef1d41fdc1e72c5688cca7e2c3a1b6',
'src/third_party/lighttpd':
@@ -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',
'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/binaries/win.git@7bd7ba645fde491aa98951b090c17dbf8ed21378',
'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':
'.'
diff --git a/DEPS b/DEPS
index 3ac83b5..6cefb3f 100644
--- a/DEPS
+++ b/DEPS
@@ -1,406 +1,227 @@
-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/branches/835",
- "webkit_revision": "91698",
- "chromium_git": "http://git.chromium.org/git",
- "swig_revision": "69281",
- # These hashes need to be updated when nacl_revision is changed.
- # After changing nacl_revision, run 'gclient runhooks' to get the new values.
- "nacl_irt_hash_x86_32": "02c4c8443656cf202562a2b9c9a63f3231fa1fbb",
- "nacl_irt_hash_x86_64": "caa69972df32882635a78f9212ea1d759380ab51",
- "nacl_revision": "6268",
- # 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_chrome_ppapi_revision": "93797", # native_client/DEPS: chrome_ppapi_rev
- "nacl_tools_revision": "HEAD", # native_client/DEPS: tools_rev
- "libjingle_revision": "77",
- "libvpx_revision": "90416",
- "ffmpeg_revision": "94155",
- "sfntly_revision": "20",
- "skia_revision": "1946",
- "v8_revision": "8695",
- "webrtc_revision": "232",
+#
+# 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 14.0.835.27
+#
+#
+#
+deps_os = {
+ 'win': {
+ 'src/chrome_frame/tools/test/reference_build/chrome_win':
+ '/trunk/deps/reference_builds/chrome_win@89574',
+ 'src/third_party/yasm/binaries':
+ '/trunk/deps/third_party/yasm/binaries@74228',
+ '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/swig/win':
+ '/trunk/deps/third_party/swig/win@69281',
+ '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@94155',
+ 'src/third_party/pefile':
+ 'http://pefile.googlecode.com/svn/trunk@63',
+ 'src/third_party/lighttpd':
+ '/trunk/deps/third_party/lighttpd@33727',
+ '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@5360',
+ 'src/third_party/nss':
+ '/trunk/deps/third_party/nss@93459',
+ 'src/rlz':
+ 'http://rlz.googlecode.com/svn/trunk@43',
+ },
+ 'mac': {
+ 'src/third_party/WebKit/WebKitLibraries':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/WebKitLibraries@92535',
+ 'src/third_party/GTM':
+ 'http://google-toolbox-for-mac.googlecode.com/svn/trunk@446',
+ '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@90649',
+ },
+ 'unix': {
+ 'src/third_party/xdg-utils':
+ '/trunk/deps/third_party/xdg-utils@93299',
+ 'src/third_party/openssl':
+ '/trunk/deps/third_party/openssl@93618',
+ 'src/third_party/swig/linux':
+ '/trunk/deps/third_party/swig/linux@69281',
+ 'src/third_party/cros':
+ 'http://git.chromium.org/git/cros.git@56c93050',
+ 'src/third_party/WebKit/Tools/gdb':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/Tools/gdb@92535',
+ 'src/third_party/lss':
+ 'http://linux-syscall-support.googlecode.com/svn/trunk/lss@3',
+ 'src/chrome/tools/test/reference_build/chrome_linux':
+ '/trunk/deps/reference_builds/chrome_linux@89574',
+ },
}
deps = {
- "src/breakpad/src":
- (Var("googlecode_url") % "google-breakpad") + "/trunk/src@786",
-
- "src/build/util/support":
- "/trunk/deps/support@20411",
-
- "src/googleurl":
- (Var("googlecode_url") % "google-url") + "/trunk@159",
-
- "src/seccompsandbox":
- (Var("googlecode_url") % "seccompsandbox") + "/trunk@160",
-
- "src/sdch/open-vcdiff":
- (Var("googlecode_url") % "open-vcdiff") + "/trunk@28",
-
- "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@705",
-
- # 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@93875",
-
- "src/third_party/hunspell":
- "/trunk/deps/third_party/hunspell@93061",
-
- "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@135",
-
- "src/third_party/leveldb":
- (Var("googlecode_url") % "leveldb") + "/trunk@36",
-
- "src/third_party/snappy/src":
- (Var("googlecode_url") % "snappy") + "/trunk@37",
-
- "src/tools/gyp":
- (Var("googlecode_url") % "gyp") + "/trunk@971",
-
- "src/v8":
- (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),
-
- "src/native_client":
- Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"),
-
- "src/native_client/src/third_party/ppapi":
- # TODO(brettw) enable the From() line instead when checkdeps is fixed.
- #From("src/native_client", "native_client/src/third_party/ppapi"),
- "/trunk/src/ppapi@" + Var("nacl_chrome_ppapi_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":
- "http://sfntly.googlecode.com/svn/trunk/cpp/src/sfntly@" +
- #TODO(arthurhsu): replace above line with this after mirror is setup.
- #(Var("googlecode_url") % "sfntly") + "/trunk/cpp/src/sfntly@" +
- Var("sfntly_revision"),
-
- "src/third_party/skia/gpu":
- (Var("googlecode_url") % "skia") + "/trunk/gpu@" + Var("skia_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/ots":
- (Var("googlecode_url") % "ots") + "/trunk@69",
-
- "src/tools/page_cycler/acid3":
- "/trunk/deps/page_cycler/acid3@19546",
-
- "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/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-mac/fast/events":
- Var("webkit_trunk") + "/LayoutTests/platform/chromium-mac/fast/events@" +
- Var("webkit_revision"),
- "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-mac/http/tests/workers":
- Var("webkit_trunk") + "/LayoutTests/platform/chromium-mac/http/tests/workers@" +
- Var("webkit_revision"),
- "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-mac/storage/domstorage":
- Var("webkit_trunk") + "/LayoutTests/platform/chromium-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.
- "src/third_party/webdriver/python/selenium":
- "http://selenium.googlecode.com/svn/trunk/py/selenium@12107",
- "src/third_party/webdriver/python/selenium/test":
- "http://selenium.googlecode.com/svn/trunk/py/test@12107",
-
- "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@83675",
-
- "src/third_party/flac":
- "/trunk/deps/third_party/flac@75901",
-
- "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/native_client':
+ 'http://src.chromium.org/native_client/branches/835/src/native_client@6317',
+ 'src/third_party/skia/include':
+ 'http://skia.googlecode.com/svn/trunk/include@1946',
+ 'src/third_party/flac':
+ '/trunk/deps/third_party/flac@75901',
+ 'src/chrome/test/data/layout_tests/LayoutTests/fast/workers':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/fast/workers@92535',
+ 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/http/tests/xmlhttprequest@92535',
+ 'src/third_party/sfntly/src/sfntly':
+ 'http://sfntly.googlecode.com/svn/trunk/cpp/src/sfntly@20',
+ 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium/fast/workers':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/platform/chromium/fast/workers@92535',
+ 'src/third_party/webdriver/python/selenium/test':
+ 'http://selenium.googlecode.com/svn/trunk/py/test@12107',
+ 'src/chrome/test/data/layout_tests/LayoutTests/fast/js/resources':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/fast/js/resources@92535',
+ 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-mac/http/tests/workers':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/platform/chromium-mac/http/tests/workers@92535',
+ 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/resources':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/http/tests/resources@92535',
+ 'src/third_party/skia/gpu':
+ 'http://skia.googlecode.com/svn/trunk/gpu@1946',
+ 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/filesystem':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/http/tests/filesystem@92535',
+ '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',
+ 'src/chrome/test/data/layout_tests/LayoutTests/fast/events':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/fast/events@92535',
+ 'src/third_party/bidichecker':
+ 'http://bidichecker.googlecode.com/svn/trunk/lib@4',
+ 'src/third_party/ots':
+ 'http://ots.googlecode.com/svn/trunk@69',
+ 'src/third_party/WebKit/Source':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/Source@92535',
+ 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/workers':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/http/tests/workers@92535',
+ '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@6201',
+ 'src/chrome/test/data/layout_tests/LayoutTests/fast/filesystem/workers':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/fast/filesystem/workers@92535',
+ 'src/tools/gyp':
+ 'http://gyp.googlecode.com/svn/trunk@971',
+ 'src/sdch/open-vcdiff':
+ 'http://open-vcdiff.googlecode.com/svn/trunk@28',
+ 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/storage/domstorage':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/platform/chromium-win/storage/domstorage@92535',
+ 'src/tools/page_cycler/acid3':
+ '/trunk/deps/page_cycler/acid3@19546',
+ 'src/chrome/test/data/layout_tests/LayoutTests/fast/filesystem/resources':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/fast/filesystem/resources@92535',
+ 'src/build/util/support':
+ '/trunk/deps/support@20411',
+ 'src/third_party/libjingle/source':
+ 'http://libjingle.googlecode.com/svn/trunk@77',
+ 'src':
+ '/branches/835/src@95785',
+ 'src/third_party/WebKit/Tools/DumpRenderTree':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/Tools/DumpRenderTree@92535',
+ 'src/third_party/hunspell':
+ '/trunk/deps/third_party/hunspell@93061',
+ 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/appcache':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/http/tests/appcache@92535',
+ 'src/testing/gtest':
+ 'http://googletest.googlecode.com/svn/trunk@560',
+ 'src/v8':
+ 'http://v8.googlecode.com/svn/branches/3.4@8828',
+ 'src/third_party/libvpx':
+ '/trunk/deps/third_party/libvpx@90416',
+ 'src/third_party/skia/third_party/glu':
+ 'http://skia.googlecode.com/svn/trunk/third_party/glu@1946',
+ 'src/breakpad/src':
+ 'http://google-breakpad.googlecode.com/svn/trunk/src@786',
+ 'chromeos':
+ '/trunk/src/tools/cros.DEPS@94063',
+ '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':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/platform/chromium-win/fast/events@92535',
+ 'src/third_party/leveldb':
+ 'http://leveldb.googlecode.com/svn/trunk@36',
+ 'src/third_party/scons-2.0.1':
+ 'http://src.chromium.org/native_client/trunk/src/third_party/scons-2.0.1@5360',
+ 'src/third_party/webdriver/python/selenium':
+ 'http://selenium.googlecode.com/svn/trunk/py/selenium@12107',
+ 'src/third_party/pylib':
+ 'http://src.chromium.org/native_client/trunk/src/third_party/pylib@5360',
+ 'src/third_party/WebKit/LayoutTests':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests@92535',
+ 'src/third_party/snappy/src':
+ 'http://snappy.googlecode.com/svn/trunk@37',
+ 'src/chrome/test/data/layout_tests/LayoutTests/http/tests/websocket/tests':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/http/tests/websocket/tests@92535',
+ 'src/third_party/webrtc':
+ 'http://webrtc.googlecode.com/svn/trunk/src@232',
+ 'src/chrome/test/data/layout_tests/LayoutTests/media':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/media@92535',
+ 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-mac/fast/events':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/platform/chromium-mac/fast/events@92535',
+ 'src/third_party/libjpeg_turbo':
+ '/trunk/deps/third_party/libjpeg_turbo@83675',
+ 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-mac/storage/domstorage':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/platform/chromium-mac/storage/domstorage@92535',
+ 'src/third_party/skia/src':
+ 'http://skia.googlecode.com/svn/trunk/src@1946',
+ 'src/third_party/ffmpeg':
+ '/trunk/deps/third_party/ffmpeg/source@94155',
+ 'src/third_party/cacheinvalidation/files/src/google':
+ 'http://google-cache-invalidation-api.googlecode.com/svn/trunk/src/google@135',
+ 'src/native_client/src/third_party/ppapi':
+ '/trunk/src/ppapi@93797',
+ 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/workers':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/platform/chromium-win/fast/workers@92535',
+ 'src/third_party/WebKit/Tools/Scripts':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/Tools/Scripts@92535',
+ 'src/chrome/test/data/layout_tests/LayoutTests/storage/domstorage':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/storage/domstorage@92535',
+ 'src/third_party/icu':
+ '/trunk/deps/third_party/icu46@93875',
+ 'src/third_party/speex':
+ '/trunk/deps/third_party/speex@83190',
+ 'src/seccompsandbox':
+ 'http://seccompsandbox.googlecode.com/svn/trunk@160',
+ 'src/third_party/yasm/source/patched-yasm':
+ '/trunk/deps/third_party/yasm/patched-yasm@73761',
+ 'src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-win/http/tests/workers':
+ 'http://svn.webkit.org/repository/webkit/branches/chromium/835/LayoutTests/platform/chromium-win/http/tests/workers@92535',
+ 'src/third_party/angle':
+ 'http://angleproject.googlecode.com/svn/branches/chrome_m14@717',
+ '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']
-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@93459",
-
- "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@44",
-
- # Dependencies used by libjpeg-turbo
- "src/third_party/yasm/binaries":
- "/trunk/deps/third_party/yasm/binaries@74228",
- },
- "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@446",
- "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@90649",
-
- "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@3",
-
- "src/third_party/openssl":
- "/trunk/deps/third_party/openssl@93618",
-
- "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",
- "o3d",
- "pdf",
- "sdch",
- "skia",
- "testing",
- "third_party",
- "v8",
-]
-
+hooks = [{'action': ['python', 'src/build/gyp_chromium'], 'pattern': '.'}, {'action': ['python', 'src/build/download_nacl_irt.py', '--base_url', 'http://commondatastorage.googleapis.com/nativeclient-archive2/irt/branches/m14', '--nacl_revision', '6297', '--file_hash', 'x86_32', '02c4c8443656cf202562a2b9c9a63f3231fa1fbb', '--file_hash', 'x86_64', 'caa69972df32882635a78f9212ea1d759380ab51'], 'pattern': '.'}]
-hooks = [
- {
- # A change to a .gyp, .gypi, or to GYP itself should run the generator.
- "pattern": ".",
- "action": ["python", "src/build/gyp_chromium"],
- },
- {
- # This downloads binaries for Native Client's integrated runtime (IRT)
- # library, which is built as NaCl untrusted code.
- "pattern": ".",
- "action": ["python", "src/build/download_nacl_irt.py",
- "--base_url",
- "http://commondatastorage.googleapis.com/nativeclient-archive2/irt/branches/m14",
- "--nacl_revision", Var("nacl_revision"),
- "--file_hash", "x86_32", Var("nacl_irt_hash_x86_32"),
- "--file_hash", "x86_64", Var("nacl_irt_hash_x86_64")],
- },
-]
+include_rules = ['+base', '+build', '+ipc', '+unicode', '+testing'] \ No newline at end of file