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

Side by Side Diff: mojo/tools/roll/update_from_chromium.py

Issue 832683005: Move the network service source-of-truth from Mojo to Chromium. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase. Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « mojo/tools/roll/rev_sdk.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright 2014 The Chromium Authors. All rights reserved. 2 # Copyright 2014 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import argparse 6 import argparse
7 import json 7 import json
8 import os 8 import os
9 import subprocess 9 import subprocess
10 import sys 10 import sys
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 "tools/relocation_packer", 73 "tools/relocation_packer",
74 "tools/valgrind", 74 "tools/valgrind",
75 "tools/vim", 75 "tools/vim",
76 "tools/xdisplaycheck", 76 "tools/xdisplaycheck",
77 "url", 77 "url",
78 "ui/gl", 78 "ui/gl",
79 ] 79 ]
80 80
81 # These directories are temporarily cloned in order to support the network 81 # These directories are temporarily cloned in order to support the network
82 # bootstrap library until we get that sorted out. 82 # bootstrap library until we get that sorted out.
83 net_dirs = ["crypto", 83 net_dirs = [
84 "net"] 84 "crypto",
85 "net",
86 "mojo/services/network"]
85 87
86 files_to_copy = ["sandbox/sandbox_export.h", 88 files_to_copy = ["sandbox/sandbox_export.h",
87 ".clang-format"] 89 ".clang-format"]
88 90
89 dirs = dirs_to_snapshot + net_dirs 91 dirs = dirs_to_snapshot + net_dirs
90 92
91 def chromium_rev_number(src_commit): 93 def chromium_rev_number(src_commit):
92 base_url = "https://cr-rev.appspot.com/_ah/api/crrev/v1/commit/" 94 base_url = "https://cr-rev.appspot.com/_ah/api/crrev/v1/commit/"
93 commit_info = json.load(urllib2.urlopen(base_url + src_commit)) 95 commit_info = json.load(urllib2.urlopen(base_url + src_commit))
94 return commit_info["numberings"][0]["number"] 96 return commit_info["numberings"][0]["number"]
(...skipping 25 matching lines...) Expand all
120 parser = argparse.ArgumentParser(description="Update the mojo repo's " + 122 parser = argparse.ArgumentParser(description="Update the mojo repo's " +
121 "snapshot of things imported from chromium.") 123 "snapshot of things imported from chromium.")
122 parser.add_argument("chromium_dir", help="chromium source dir") 124 parser.add_argument("chromium_dir", help="chromium source dir")
123 args = parser.parse_args() 125 args = parser.parse_args()
124 rev(args.chromium_dir) 126 rev(args.chromium_dir)
125 patch.patch() 127 patch.patch()
126 return 0 128 return 0
127 129
128 if __name__ == "__main__": 130 if __name__ == "__main__":
129 sys.exit(main()) 131 sys.exit(main())
OLDNEW
« no previous file with comments | « mojo/tools/roll/rev_sdk.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698