Add sandbox/linux and other necessary deps to pull from chromium
This adds sandbox/linux/ and sandbox/sandbox_export.h along with a few
other directories that are needed on chromium ToT.
TBR=abarth@chromium.org
Review URL: https://codereview.chromium.org/679543002
diff --git a/mojo/tools/roll/rev.py b/mojo/tools/roll/rev.py
index fe2cc29..8b5de9c 100755
--- a/mojo/tools/roll/rev.py
+++ b/mojo/tools/roll/rev.py
@@ -16,6 +16,7 @@
"cc",
"gpu",
"ppapi/generators",
+ "sandbox/linux",
"sdch",
"skia",
"testing",
@@ -24,6 +25,7 @@
"third_party/binutils",
"third_party/boringssl",
"third_party/brotli",
+ "third_party/checkstyle",
"third_party/cython",
"third_party/fontconfig",
"third_party/freetype2",
@@ -63,10 +65,12 @@
"tools/lsan",
"tools/msan",
"tools/protoc_wrapper",
+ "tools/relocation_packer",
"tools/valgrind",
"tools/vim",
"tools/xdisplaycheck",
"url",
+ "ui/gl",
]
# These directories are temporarily cloned in order to support the network
@@ -76,6 +80,8 @@
"net",
]
+files_to_copy = ["sandbox/sandbox_export.h"]
+
dirs = dirs_to_snapshot + net_dirs
def rev(source_dir):
@@ -87,7 +93,7 @@
os.chdir(mojo_root_dir)
try:
system(["git", "rm", "-r", d])
- except subprocess.CheckProcessError:
+ except subprocess.CalledProcessError:
print "Could not remove %s" % d
print "cloning directory %s" % d
os.chdir(source_dir)
@@ -99,6 +105,9 @@
os.chdir(mojo_root_dir)
system(["git", "add", d])
+ for f in files_to_copy:
+ system(["cp", os.path.join(source_dir, f), os.path.join(mojo_root_dir, f)])
+
os.chdir(mojo_root_dir)
system(["git", "add", "."])
commit("Update from chromium " + src_commit)
