Sync to r9495, and update DEPS via deps2git tool
diff --git a/DEPS b/DEPS
index 75ca33c..cb06910 100644
--- a/DEPS
+++ b/DEPS
@@ -1,130 +1,148 @@
-# DEPS files look like -*- Python -*-
-
+# 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 = {
- # When possible, keep chrome_rev and chromebinaries_rev at the same
- # value. chromebinaries_rev should match LKGR so that we can download
- # the binaries, but sometimes chrome_rev needs to be more recent to get
- # source changes when LKGR is lagging too far back.
- "chromebinaries_rev": "147940",
- "chrome_rev": "147940",
- # NOTE! These four should match their counterparts in chromium/src/DEPS.
- # Be sure to update them when updating chrome_rev, above.
- "gtest_rev": "617",
- "gyp_rev": "1431",
- "jsoncpp_revision": "248",
- "lss_rev": "11",
-
- "lcov_rev": "54822",
- "python_26_rev": "53573",
- "tools_rev": "9330",
-
- # These are URL prefixes rather than revision numbers, so keep them separate.
- "chromium_trunk": "http://src.chromium.org/svn/trunk",
- "googlecode_url": "http://%s.googlecode.com/svn",
- "native_client_trunk": "http://src.chromium.org/native_client/trunk",
- "o3d_trunk": "http://o3d.googlecode.com/svn/trunk",
- "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s",
+ 'chromium_trunk':
+ 'http://src.chromium.org/svn/trunk',
+ 'o3d_trunk':
+ 'http://o3d.googlecode.com/svn/trunk',
+ 'python_26_rev':
+ '53573',
+ 'gyp_rev':
+ '1431',
+ 'tools_rev':
+ '9330',
+ 'native_client_trunk':
+ 'http://src.chromium.org/native_client/trunk',
+ 'lcov_rev':
+ '54822',
+ 'chromebinaries_rev':
+ '147940',
+ 'gtest_rev':
+ '617',
+ 'googlecode_url':
+ 'http://%s.googlecode.com/svn',
+ 'lss_rev':
+ '11',
+ 'webkit_url':
+ 'https://chromium.googlesource.com/chromium/blink.git',
+ 'chrome_rev':
+ '147940',
+ 'jsoncpp_revision':
+ '248',
+ 'sourceforge_url':
+ 'http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s',
+ 'git_url':
+ 'https://chromium.googlesource.com'
}
deps = {
- "base":
- Var("chromium_trunk") + "/src/base@" + Var("chrome_rev"),
- "build":
- Var("chromium_trunk") + "/src/build@" + Var("chrome_rev"),
- "chrome/test/pyautolib":
- Var("chromium_trunk") + "/src/chrome/test/pyautolib@" + Var("chrome_rev"),
- "gpu":
- Var("chromium_trunk") + "/src/gpu@" + Var("chrome_rev"),
- "native_client/tools/perf_expectations":
- Var("chromium_trunk") + "/src/tools/perf_expectations@" + Var("chrome_rev"),
- "net/tools/testserver":
- Var("chromium_trunk") + "/src/net/tools/testserver@" + Var("chrome_rev"),
- "ppapi":
- Var("chromium_trunk") + "/src/ppapi@" + Var("chrome_rev"),
- "testing/gtest":
- "http://googletest.googlecode.com/svn/trunk@" + Var("gtest_rev"),
- "third_party":
- Var("native_client_trunk") + "/src/third_party@" + Var("tools_rev"),
- "validator_snapshots":
- Var("native_client_trunk") + "/src/validator_snapshots@" + Var("tools_rev"),
- "third_party/asan":
- Var("chromium_trunk") + "/deps/third_party/asan@" + Var("chrome_rev"),
- "third_party/gles2_book":
- Var("chromium_trunk") + "/src/third_party/gles2_book@" + Var("chrome_rev"),
- "third_party/jsoncpp":
- Var("chromium_trunk") + "/src/third_party/jsoncpp@" + Var("chrome_rev"),
- # NOTE! These two for jsoncpp are taken verbatim from chromium/src/DEPS
- # and must match what is used there.
- "third_party/jsoncpp/source/include":
- (Var("sourceforge_url") % {"repo": "jsoncpp"}) +
- "/trunk/jsoncpp/include@" + Var("jsoncpp_revision"),
- "third_party/jsoncpp/source/src/lib_json":
- (Var("sourceforge_url") % {"repo": "jsoncpp"}) +
- "/trunk/jsoncpp/src/lib_json@" + Var("jsoncpp_revision"),
- "third_party/lcov":
- Var("chromium_trunk") + "/src/third_party/lcov@" + Var("lcov_rev"),
- "third_party/lss":
- ((Var("googlecode_url") % "linux-syscall-support") +
- "/trunk/lss@" + Var("lss_rev")),
- "third_party/khronos":
- Var("chromium_trunk") + "/src/third_party/khronos@" + Var("chrome_rev"),
- "third_party/ply":
- Var("chromium_trunk") + "/src/third_party/ply@" + Var("chrome_rev"),
- "third_party/pyftpdlib":
- Var("chromium_trunk") + "/src/third_party/pyftpdlib@" + Var("chrome_rev"),
- "third_party/pyftpdlib/src":
- (Var("googlecode_url") % "pyftpdlib") + "/trunk@888",
- "third_party/simplejson":
- (Var("chromium_trunk") + "/tools/build/third_party/simplejson@" +
- Var("chrome_rev")),
- "third_party/tlslite":
- Var("chromium_trunk") + "/src/third_party/tlslite@" + Var("chrome_rev"),
- "tools/clang":
- Var("chromium_trunk") + "/src/tools/clang@" + Var("chrome_rev"),
- "tools/gyp":
- "http://gyp.googlecode.com/svn/trunk@" + Var("gyp_rev"),
- "tools/valgrind":
- Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chrome_rev"),
+ 'base':
+ Var('git_url') + '/chromium/src/base.git@9206024f3b6b6b695cb7db800c9489b554bccf9c',
+ 'build':
+ Var('git_url') + '/chromium/src/build.git@f5f7865054fbf59c65f1aa6e5bbb6393332c0463',
+ 'chrome/test/pyautolib':
+ Var('git_url') + '/chromium/src/chrome/test/pyautolib.git@2765c22a732ea18fe1a6cd3d2e29c9f3224438aa',
+ 'gpu':
+ Var('git_url') + '/chromium/src/gpu.git@b66d14e4340be9e843eea450c13baa7682bb70db',
+ 'native_client/tools/perf_expectations':
+ Var('git_url') + '/chromium/src/tools/perf_expectations.git@5a2630c1fc344fe96931d1e4d8dd758ec7970da0',
+ 'net/tools/testserver':
+ Var('git_url') + '/chromium/src/net/tools/testserver.git@983fc4633ff0069243b05a8a3a7d370399f11043',
+ 'ppapi':
+ Var('git_url') + '/chromium/src/ppapi.git@8a76deb2712f1f6ea154e24e594b53a74cb42667',
+ 'testing/gtest':
+ Var('git_url') + '/external/googletest.git@090d8a824857f24e5ec780112a3d4b269f9a7d3d',
+ 'third_party':
+ Var('git_url') + '/native_client/src/third_party.git@65665a7b13c7dae9db56283046fbf8f114c9dc8c',
+ 'third_party/asan':
+ Var('git_url') + '/chromium/deps/asan.git@245a68a0347562da54e3e5881010f55a994c783f',
+ 'third_party/gles2_book':
+ Var('git_url') + '/chromium/src/third_party/gles2_book.git@b91648d289f982ce27fda1d1a3f53eb8c8715ebc',
+ 'third_party/jsoncpp':
+ Var('git_url') + '/chromium/src/third_party/jsoncpp.git@9bfa4b91714e1f4423e87714a69eec8c9df20b98',
+ 'third_party/jsoncpp/source/include':
+ Var('git_url') + '/external/jsoncpp/jsoncpp/include.git@b0dd48e02b6e6248328db78a65b5c601f150c349',
+ 'third_party/jsoncpp/source/src/lib_json':
+ Var('git_url') + '/external/jsoncpp/jsoncpp/src/lib_json.git@a8caa51ba2f80971a45880425bf2ae864a786784',
+ 'third_party/khronos':
+ Var('git_url') + '/chromium/src/third_party/khronos.git@52db1f31446bedd13acadb78f4ecc72bf2e7300a',
+ 'third_party/lcov':
+ Var('git_url') + '/chromium/src/third_party/lcov.git@ba4a791b2b525fc13d169b4cc671dede09bbfb64',
+ 'third_party/lss':
+ Var('git_url') + '/external/linux-syscall-support/lss.git@88a55e021b5cf8114901c5354894bfec13d13157',
+ 'third_party/ply':
+ Var('git_url') + '/chromium/src/third_party/ply.git@85f199de78c81a719d20096120379c704f14082e',
+ 'third_party/pyftpdlib':
+ Var('git_url') + '/chromium/src/third_party/pyftpdlib.git@69a5604ca34948831339ac985216a0fdbfb9f575',
+ 'third_party/pyftpdlib/src':
+ Var('git_url') + '/external/pyftpdlib.git@3647f3cafa367c9576f29bde2f7b6d1b7d2983b3',
+ 'third_party/simplejson':
+ Var('git_url') + '/chromium/tools/build/third_party/simplejson.git@d090d5fdd5957d4c1790eb9c4a8c4a3c64c61858',
+ 'third_party/tlslite':
+ Var('git_url') + '/chromium/src/third_party/tlslite.git@7eeab74ea2dbd602e31a021ed26e96205eb18b3b',
+ 'tools/clang':
+ Var('git_url') + '/chromium/src/tools/clang.git@348b9ca0608cb1a3418a0137f786ab0d6551ca5e',
+ 'tools/gyp':
+ Var('git_url') + '/external/gyp.git@4bfc711e69c1fb69ec8a6c53286985c7d38c916c',
+ 'tools/valgrind':
+ Var('git_url') + '/chromium/src/tools/valgrind.git@bda0bee6d7276913a8a35c7471ab5c66d591070e',
+ 'validator_snapshots':
+ Var('git_url') + '/native_client/src/validator_snapshots.git@4c1ea6b6ebe020993b0a091fd4e38a6487704b60',
}
deps_os = {
- "win": {
- # GNU binutils assembler for x86-32.
- "third_party/gnu_binutils":
- (Var("native_client_trunk") + "/deps/third_party/gnu_binutils@" +
- Var("tools_rev")),
- # GNU binutils assembler for x86-64.
- "third_party/mingw-w64/mingw/bin":
- (Var("native_client_trunk") + "/deps/third_party/mingw-w64/mingw/bin@" +
- Var("tools_rev")),
- "third_party/NSIS":
- (Var("native_client_trunk") + "/deps/third_party/NSIS@" +
- Var("tools_rev")),
- "third_party/python_26":
- (Var("chromium_trunk") + "/tools/third_party/python_26@" +
- Var("python_26_rev")),
- },
- "unix": {
- # Ragel for validator_ragel
- "third_party/ragel":
- (Var("native_client_trunk") + "/deps/third_party/ragel@" +
- Var("tools_rev")),
- }
+ 'unix':
+ {
+ 'third_party/ragel':
+ Var('git_url') + '/native_client/deps/third_party/ragel.git@da42bb33f1b67c2d70b38ec1d2edf5263271b635',
+ },
+ 'win':
+ {
+ 'third_party/NSIS':
+ Var('git_url') + '/native_client/deps/third_party/NSIS.git@21b6ad22daa7bfc04b9f1c1805a34622e2607a93',
+ 'third_party/gnu_binutils':
+ Var('git_url') + '/native_client/deps/third_party/gnu_binutils.git@f4003433b61b25666565690caf3d7a7a1a4ec436',
+ 'third_party/mingw-w64/mingw/bin':
+ Var('git_url') + '/native_client/deps/third_party/mingw-w64/mingw/bin.git@3cc8b140b883a9fe4986d12cfd46c16a093d3527',
+ 'third_party/python_26':
+ Var('git_url') + '/chromium/deps/python_26.git@0f769a0323d9a5a301bb9c50e48f43166939a923',
+ },
}
-hooks = [
- {
- "pattern": ".",
- "action": ["python", "native_client/build/download_toolchains.py",
- "--keep", "native_client/TOOL_REVISIONS"],
- },
- {
- "pattern": ".",
- "action": ["python", "native_client/build/gyp_nacl"],
- },
+include_rules = [
+ '+native_client/src/include',
+ '+gtest'
]
-include_rules = [
- "+native_client/src/include",
- "+gtest",
+skip_child_includes = [
+
+]
+
+hooks = [
+ {
+ 'action':
+ [
+ 'python',
+ 'native_client/build/download_toolchains.py',
+ '--keep',
+ 'native_client/TOOL_REVISIONS'
+],
+ 'pattern':
+ '.'
+},
+ {
+ 'action':
+ [
+ 'python',
+ 'native_client/build/gyp_nacl'
+],
+ 'pattern':
+ '.'
+}
+]
+recursedeps = [
+
]
