Index: mojo/tools/rev_sdk.py |
diff --git a/mojo/tools/rev_sdk.py b/mojo/tools/rev_sdk.py |
index 15812c5a7464a4678111fa66c9675d0905d7c62c..06241ee2548bc7e7d5466ee9fd28f303927bc099 100755 |
--- a/mojo/tools/rev_sdk.py |
+++ b/mojo/tools/rev_sdk.py |
@@ -23,7 +23,7 @@ sdk_dirs_to_clone = [ |
sdk_dirs_to_not_clone = [ |
"mojo/public/cpp/application", |
"mojo/public/interfaces/application", |
- "third_party/mojo/src/mojo/public/java/application", |
+ "mojo/public/java/application", |
] |
# Individual files to preserve within the target repository during roll. These |
@@ -43,8 +43,9 @@ for sdk_dir in sdk_dirs_to_clone: |
sdk_dir_in_chromium = os.path.join(sdk_prefix_in_chromium, sdk_dir) |
dirs_to_clone[sdk_dir] = sdk_dir_in_chromium |
-def rev(source_dir, chromium_dir): |
- src_commit = system(["git", "show-ref", "HEAD", "-s"], cwd=source_dir).strip() |
+def rev(source_dir, chromium_dir, mojo_revision): |
+ src_commit = system(["git", "rev-parse", mojo_revision], |
+ cwd=source_dir).strip() |
for input_dir, dest_dir in dirs_to_clone.iteritems(): |
if os.path.exists(os.path.join(chromium_dir, dest_dir)): |
@@ -89,8 +90,15 @@ def rev(source_dir, chromium_dir): |
commit("Update mojo sdk to rev " + src_commit, cwd=chromium_dir) |
-if len(sys.argv) != 2: |
- print "usage: rev_sdk.py <mojo source dir>" |
+if len(sys.argv) < 2: |
+ print "usage: rev_sdk.py <mojo source dir> [<mojo revision>]" |
sys.exit(1) |
-rev(sys.argv[1], chromium_root_dir) |
+# Allow override of the roll revision. |
+if len(sys.argv) == 3: |
+ mojo_revision = sys.argv[2] |
+else: |
+ mojo_revision = 'origin/HEAD' |
+ |
+rev(sys.argv[1], chromium_root_dir, mojo_revision) |
+ |