OLD | NEW |
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 os | 6 import os |
7 import sys | 7 import sys |
8 from utils import commit | 8 from utils import commit |
9 from utils import mojo_root_dir | 9 from utils import mojo_root_dir |
10 from utils import system | 10 from utils import system |
(...skipping 11 matching lines...) Expand all Loading... |
22 | 22 |
23 # Note: Services are placed under |services_prefix_in_chromium| at their | 23 # Note: Services are placed under |services_prefix_in_chromium| at their |
24 # location relative to |services_prefix_in_mojo|. | 24 # location relative to |services_prefix_in_mojo|. |
25 services_dirs_to_clone = [ | 25 services_dirs_to_clone = [ |
26 "mojo/services/public", | 26 "mojo/services/public", |
27 "mojo/services/accessibility/public", | 27 "mojo/services/accessibility/public", |
28 "mojo/services/clipboard/public", | 28 "mojo/services/clipboard/public", |
29 "mojo/services/content_handler/public", | 29 "mojo/services/content_handler/public", |
30 "mojo/services/geometry/public", | 30 "mojo/services/geometry/public", |
31 "mojo/services/gpu/public", | 31 "mojo/services/gpu/public", |
| 32 "mojo/services/http_server/public", |
32 "mojo/services/input_events/public", | 33 "mojo/services/input_events/public", |
33 "mojo/services/native_viewport/public", | 34 "mojo/services/native_viewport/public", |
34 "mojo/services/navigation/public", | 35 "mojo/services/navigation/public", |
35 "mojo/services/surfaces/public", | 36 "mojo/services/surfaces/public", |
36 "mojo/services/view_manager/public", | 37 "mojo/services/view_manager/public", |
37 "mojo/services/window_manager/public", | 38 "mojo/services/window_manager/public", |
38 ] | 39 ] |
39 | 40 |
40 # A dictionary mapping dirs to clone to their destination locations in Chromium. | 41 # A dictionary mapping dirs to clone to their destination locations in Chromium. |
41 dirs_to_clone = {} | 42 dirs_to_clone = {} |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 with open(version_filename, "w") as version_file: | 80 with open(version_filename, "w") as version_file: |
80 version_file.write(src_commit) | 81 version_file.write(src_commit) |
81 system(["git", "add", version_filename], cwd=chromium_dir) | 82 system(["git", "add", version_filename], cwd=chromium_dir) |
82 commit("Update mojo sdk to rev " + src_commit, cwd=chromium_dir) | 83 commit("Update mojo sdk to rev " + src_commit, cwd=chromium_dir) |
83 | 84 |
84 if len(sys.argv) != 2: | 85 if len(sys.argv) != 2: |
85 print "usage: rev_sdk.py <chromium source dir>" | 86 print "usage: rev_sdk.py <chromium source dir>" |
86 sys.exit(1) | 87 sys.exit(1) |
87 | 88 |
88 rev(mojo_root_dir, sys.argv[1]) | 89 rev(mojo_root_dir, sys.argv[1]) |
OLD | NEW |