Roll DEPS.
diff --git a/DEPS b/DEPS
index f228452..d00d462 100644
--- a/DEPS
+++ b/DEPS
@@ -17,10 +17,11 @@
#
# # Create and switch to a new branch
# git new-branch depsroll
-# # Run roll-dep (provided by depot_tools) giving the dep's path and the
-# # desired SVN revision number (e.g., third_party/foo/bar and a revision such
-# # number from Subversion)
-# roll-dep third_party/foo/bar REVISION_NUMBER
+# # Run roll-dep (provided by depot_tools) giving the dep's path and optionally
+# # a regex that will match the line in this file that contains the current
+# # revision. The script ALWAYS rolls the dependency to the latest revision
+# # in origin/master. The path for the dep should start with src/.
+# roll-dep src/third_party/foo_package/src foo_package.git
# # You should now have a modified DEPS file; commit and upload as normal
# git commit -a
# git cl upload
@@ -30,59 +31,51 @@
# 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://svn.code.sf.net/p/%(repo)s/code',
- 'llvm_url': 'http://src.chromium.org/llvm-project',
- 'llvm_git': 'https://llvm.googlesource.com',
- 'webkit_trunk': 'http://src.chromium.org/blink/trunk',
- 'webkit_revision': 'ff93a8671a046304f8dfeeed6f7a366432d30f8b', # from svn revision 195201
'chromium_git': 'https://chromium.googlesource.com',
- 'chromiumos_git': 'https://chromium.googlesource.com/chromiumos',
- 'pdfium_git': 'https://pdfium.googlesource.com',
- 'skia_git': 'https://skia.googlesource.com',
- 'boringssl_git': 'https://boringssl.googlesource.com',
- 'libvpx_revision': 'e9830e14ed6d3422c803bf45e0f6ffec341d8666',
- 'sfntly_revision': '1bdaae8fc788a5ac8936d68bf24f37d977a13dac',
- 'skia_revision': '8e5c177c8589e00f630ac6fae763c65cb9cae896',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling sfntly
+ # and whatever else without interference from each other.
+ 'sfntly_revision': '130f832eddf98467e6578b548cb74ce17d04a26d',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
- # and V8 without interference from each other.
- 'v8_branch': 'trunk',
- 'v8_revision': '2e4c5505e85d94b520e853dda3f0cc3f2769e5f0',
+ # and whatever else without interference from each other.
+ 'skia_revision': '7d5105c4d2a9be7ef9ddba646471c35d4c966d97',
# Three lines of non-changing comments so that
- # the commit queue can handle CLs rolling WebRTC
- # and V8 without interference from each other.
+ # the commit queue can handle CLs rolling V8
+ # and whatever else without interference from each other.
+ 'v8_revision': '44a17d4f036e8b740aebd4374d6a6eee41966d38',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
# and whatever else without interference from each other.
- 'swarming_revision': 'f222001cc23c7cdb574bf4cfb447f65c94bc6da3',
+ 'swarming_revision': 'df99a00d96fae932bae824dccba13156bf7eddd0',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling ANGLE
# and whatever else without interference from each other.
- 'angle_revision': 'b11e2483742db884bd0af41f78f528240577356b',
+ 'angle_revision': 'dd5c5b79333fdde7858a77d39e91cc3d30b74c9e',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling build tools
# and whatever else without interference from each other.
- 'buildtools_revision': 'b0ede9c89f9d5fbe5387d961ad4c0ec665b6c821',
+ 'buildtools_revision': '818123dac34899ec230840936fc15b8b2b5556f9',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling PDFium
# and whatever else without interference from each other.
- 'pdfium_revision': 'ad2a822ce5c320c61510ffdc309f766ab1056ef5',
+ 'pdfium_revision': '628f7053cc646c58c61add247c75bc65ac135327',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling openmax_dl
# and whatever else without interference from each other.
- 'openmax_dl_revision': '0b238cb62c32b6f45680cf577eddb1b051ae0219',
+ 'openmax_dl_revision': '7a179b97899cf33d4a12c7ef590176c519016f4d',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other.
- 'boringssl_revision': '68de407b5fc746c0fa82706dd897288d01c32930',
+ 'boringssl_revision': 'fde89b43c347155798dee8b1210c2c5faabe25f8',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling nss
# and whatever else without interference from each other.
- 'nss_revision': '95068068df410e398ac221a9195c999b22bd63e9', # from svn revision 294785
+ 'nss_revision': 'a676aa04ff18b30983cac03dede5861b3db62c9d',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling google-toolbox-for-mac
# and whatever else without interference from each other.
- 'google_toolbox_for_mac_revision': 'ce47a231ea0b238fbe95538e86cc61d74c234be6', # from svn revision 705
+ 'google_toolbox_for_mac_revision': '401878398253074c515c03cb3a3f8bb0cc8da6e9',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling lighttpd
# and whatever else without interference from each other.
@@ -90,11 +83,16 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling lss
# and whatever else without interference from each other.
- 'lss_revision': '6f97298fe3794e92c8c896a6bc06e0b36e4c3de3',
+ 'lss_revision': '4fc942258fe5509549333b9487ec018e3c8c5b10',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling NaCl
# and whatever else without interference from each other.
- 'nacl_revision': 'c3aa3421888b5e69932e2389658969ac181b83f7',
+ 'nacl_revision': 'a0559c4cc7e9f95b41982a8f4ba10a04173c6c75',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling dEQP
+ # and whatever else without interference from each other.
+ 'deqp_revision': 'cc0ded6c77267bbb14d21aac358fc5d9690c07f8',
+ 'deqp_url': 'https://android.googlesource.com/platform/external/deqp',
}
# Only these hosts are allowed for dependencies in this DEPS file.
@@ -108,17 +106,49 @@
deps = {
'src/testing/gtest':
- Var('chromium_git') + '/external/googletest.git' + '@' + 'be1868139ffe0ccd0e8e3b37292b84c821d9c8ad', # from svn revision 704
+ Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6f8a66431cb592dad629028a50b3dd418a408c87',
}
+
deps_os = {
- 'unix': {
+ 'unix': {
# Linux, really.
'src/third_party/lss':
Var('chromium_git') + '/external/linux-syscall-support/lss.git' + '@' + Var('lss_revision'),
},
}
+
+include_rules = [
+ # Everybody can use some things.
+ # NOTE: THIS HAS TO STAY IN SYNC WITH third_party/DEPS which disallows these.
+ '+base',
+ '+build',
+ '+ipc',
+
+ # Everybody can use headers generated by tools/generate_library_loader.
+ '+library_loaders',
+
+ '+testing',
+ '+third_party/icu/source/common/unicode',
+ '+third_party/icu/source/i18n/unicode',
+ '+url',
+]
+
+
+# checkdeps.py shouldn't check include paths for files in these dirs:
+skip_child_includes = [
+ 'breakpad',
+ 'native_client_sdk',
+ 'out',
+ 'sdch',
+ 'skia',
+ 'testing',
+ 'v8',
+ 'win8',
+]
+
+
hooks = [
{
# Pull clang if needed or requested via GYP_DEFINES.
@@ -127,15 +157,16 @@
'pattern': '.',
'action': ['python', 'src/tools/clang/scripts/update.py', '--if-needed'],
},
+
{
'name': 'gn_linux64',
'pattern': '.',
'action': [ 'download_from_google_storage',
- '--no_resume',
- '--platform=linux*',
- '--no_auth',
- '--bucket', 'chromium-gn',
- '-s', 'src/buildtools/linux64/gn.sha1',
+ '--no_resume',
+ '--platform=linux*',
+ '--no_auth',
+ '--bucket', 'chromium-gn',
+ '-s', 'src/buildtools/linux64/gn.sha1',
],
},
]
