Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1531)

Unified Diff: mojo/tools/roll/rev.py

Issue 679543002: Add sandbox/linux and other necessary deps to pull from chromium (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: add third_party/checkstyle Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/tools/roll/rev.py
diff --git a/mojo/tools/roll/rev.py b/mojo/tools/roll/rev.py
index fe2cc297ab6e8fd6115e939f7c9c815582cc186b..8b5de9c4b56f5238b984973b0395aa7c77f0006a 100755
--- a/mojo/tools/roll/rev.py
+++ b/mojo/tools/roll/rev.py
@@ -16,6 +16,7 @@ dirs_to_snapshot = [
"cc",
"gpu",
"ppapi/generators",
+ "sandbox/linux",
"sdch",
"skia",
"testing",
@@ -24,6 +25,7 @@ dirs_to_snapshot = [
"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 @@ dirs_to_snapshot = [
"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_dirs = ["crypto",
"net",
]
+files_to_copy = ["sandbox/sandbox_export.h"]
+
dirs = dirs_to_snapshot + net_dirs
def rev(source_dir):
@@ -87,7 +93,7 @@ def rev(source_dir):
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 @@ def rev(source_dir):
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)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698