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

Side by Side Diff: mojo/tools/rev_sdk.py

Issue 1131753005: Move Android Mojo application files to mojo/application from third_party. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
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 """Tool to roll Mojo into Chromium. See: 6 """Tool to roll Mojo into Chromium. See:
7 https://github.com/domokit/mojo/wiki/Rolling-code-between-chromium-and-mojo#mojo ---chromium-updates-sdk--edk 7 https://github.com/domokit/mojo/wiki/Rolling-code-between-chromium-and-mojo#mojo ---chromium-updates-sdk--edk
8 """ 8 """
9 9
10 import os 10 import os
11 import sys 11 import sys
12 from utils import commit 12 from utils import commit
13 from utils import chromium_root_dir 13 from utils import chromium_root_dir
14 from utils import system 14 from utils import system
15 15
16 sdk_prefix_in_chromium = "third_party/mojo/src" 16 sdk_prefix_in_chromium = "third_party/mojo/src"
17 sdk_dirs_to_clone = [ 17 sdk_dirs_to_clone = [
18 "mojo/edk", 18 "mojo/edk",
19 "mojo/public", 19 "mojo/public",
20 "nacl_bindings", 20 "nacl_bindings",
21 ] 21 ]
22 22
23 sdk_dirs_to_not_clone = [ 23 sdk_dirs_to_not_clone = [
24 "mojo/public/cpp/application", 24 "mojo/public/cpp/application",
25 "mojo/public/interfaces/application", 25 "mojo/public/interfaces/application",
26 "third_party/mojo/src/mojo/public/java/application",
26 ] 27 ]
27 28
28 # Individual files to preserve within the target repository during roll. These 29 # Individual files to preserve within the target repository during roll. These
29 # are relative to |sdk_prefix_in_chromium| but are not maintained in the mojo 30 # are relative to |sdk_prefix_in_chromium| but are not maintained in the mojo
30 # repository. 31 # repository.
31 preserved_chromium_files = [ 32 preserved_chromium_files = [
32 "mojo/edk/DEPS", 33 "mojo/edk/DEPS",
33 "mojo/public/DEPS", 34 "mojo/public/DEPS",
34 "mojo/public/platform/nacl/DEPS", 35 "mojo/public/platform/nacl/DEPS",
35 "nacl_bindings/DEPS", 36 "nacl_bindings/DEPS",
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 system(["git", "reset", "--", preserved_path]) 87 system(["git", "reset", "--", preserved_path])
87 system(["git", "checkout", preserved_path]) 88 system(["git", "checkout", preserved_path])
88 89
89 commit("Update mojo sdk to rev " + src_commit, cwd=chromium_dir) 90 commit("Update mojo sdk to rev " + src_commit, cwd=chromium_dir)
90 91
91 if len(sys.argv) != 2: 92 if len(sys.argv) != 2:
92 print "usage: rev_sdk.py <mojo source dir>" 93 print "usage: rev_sdk.py <mojo source dir>"
93 sys.exit(1) 94 sys.exit(1)
94 95
95 rev(sys.argv[1], chromium_root_dir) 96 rev(sys.argv[1], chromium_root_dir)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698