summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--DEPS8
2 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b00afb7..17b5caf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -227,6 +227,7 @@ v8.log
/third_party/asan
/third_party/bidichecker
/third_party/bison
+/third_party/boringssl/src
/third_party/brotli/src
/third_party/cacheinvalidation/cacheinvalidation_unittests_run.xml
/third_party/cacheinvalidation/src
diff --git a/DEPS b/DEPS
index f25ef40..5b663641 100644
--- a/DEPS
+++ b/DEPS
@@ -33,6 +33,7 @@ vars = {
"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",
"swig_revision": "230490",
"nacl_revision": "13430",
# After changing nacl_revision, run 'glient sync' and check native_client/DEPS
@@ -81,6 +82,10 @@ vars = {
# the commit queue can handle CLs rolling openmax_dl
# and whatever else without interference from each other.
"openmax_dl_revision": "6483",
+ # 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": "8af663956519f7302284c0c36b413c0495986e14",
}
deps = {
@@ -319,6 +324,9 @@ deps = {
"src/third_party/pdfium":
Var("pdfium_git") + "/pdfium.git@" + Var("pdfium_revision"),
+
+ "src/third_party/boringssl/src":
+ Var("boringssl_git") + "/boringssl.git@" + Var("boringssl_revision"),
}