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

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

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 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 | « mojo/tools/roll/sanitizers_build.patch ('k') | sandbox/linux/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/tools/roll/update_from_chromium.py
diff --git a/mojo/tools/roll/update_from_chromium.py b/mojo/tools/roll/update_from_chromium.py
index a4f0cf599d69791f1598922455faaefdd5ddb9a7..d9ae68d57f8cea7a33645a88afa14911152e78bb 100755
--- a/mojo/tools/roll/update_from_chromium.py
+++ b/mojo/tools/roll/update_from_chromium.py
@@ -57,7 +57,11 @@ files_to_copy = [ "sandbox/sandbox_export.h" ]
# The contents of these files before the roll will be preserved after the roll,
# even though they live in directories rolled in from Chromium.
-files_not_to_roll = [ "build/module_args/mojo.gni" ]
+files_not_to_roll = [
+ "build/config/ui.gni",
+ "build/ls.py",
+ "build/module_args/mojo.gni",
+]
dirs = dirs_to_snapshot
« no previous file with comments | « mojo/tools/roll/sanitizers_build.patch ('k') | sandbox/linux/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698