| 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 |
| 11 | 11 |
| 12 sdk_prefix_in_chromium = "third_party/mojo/src" | 12 sdk_prefix_in_chromium = "third_party/mojo/src" |
| 13 sdk_dirs_to_clone = [ | 13 sdk_dirs_to_clone = [ |
| 14 "mojo/edk", | 14 "mojo/edk", |
| 15 "mojo/public", | 15 "mojo/public", |
| 16 "nacl_bindings", |
| 16 ] | 17 ] |
| 17 | 18 |
| 18 | 19 |
| 19 services_prefix_in_mojo = "mojo/services" | 20 services_prefix_in_mojo = "mojo/services" |
| 20 services_prefix_in_chromium = "third_party/mojo_services/src" | 21 services_prefix_in_chromium = "third_party/mojo_services/src" |
| 21 | 22 |
| 22 # Note: Services are placed under |services_prefix_in_chromium| at their | 23 # Note: Services are placed under |services_prefix_in_chromium| at their |
| 23 # location relative to |services_prefix_in_mojo|. | 24 # location relative to |services_prefix_in_mojo|. |
| 24 services_dirs_to_clone = [ | 25 services_dirs_to_clone = [ |
| 25 "mojo/services/public", | 26 "mojo/services/public", |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 with open(version_filename, "w") as version_file: | 79 with open(version_filename, "w") as version_file: |
| 79 version_file.write(src_commit) | 80 version_file.write(src_commit) |
| 80 system(["git", "add", version_filename], cwd=chromium_dir) | 81 system(["git", "add", version_filename], cwd=chromium_dir) |
| 81 commit("Update mojo sdk to rev " + src_commit, cwd=chromium_dir) | 82 commit("Update mojo sdk to rev " + src_commit, cwd=chromium_dir) |
| 82 | 83 |
| 83 if len(sys.argv) != 2: | 84 if len(sys.argv) != 2: |
| 84 print "usage: rev_sdk.py <chromium source dir>" | 85 print "usage: rev_sdk.py <chromium source dir>" |
| 85 sys.exit(1) | 86 sys.exit(1) |
| 86 | 87 |
| 87 rev(mojo_root_dir, sys.argv[1]) | 88 rev(mojo_root_dir, sys.argv[1]) |
| OLD | NEW |