Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f

mojo/tools/rev_sdk.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Tool to roll Mojo into Chromium. See:
 https://github.com/domokit/mojo/wiki/Rolling-code-between-chromium-and-mojo#mojo---chromium-updates-sdk--edk
 """
 
 import os
 import sys
 from utils import commit
 from utils import chromium_root_dir
 from utils import system
 
 sdk_prefix_in_chromium = "third_party/mojo/src"
 sdk_dirs_to_clone = [
   "mojo/edk",
   "mojo/public",
   "nacl_bindings",
 ]
 
 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
 # are relative to |sdk_prefix_in_chromium| but are not maintained in the mojo
 # repository.
 preserved_chromium_files = [
   "mojo/edk/DEPS",
   "mojo/public/DEPS",
   "mojo/public/platform/nacl/DEPS",
   "nacl_bindings/DEPS",
 ]
 
 # A dictionary mapping dirs to clone to their destination locations in Chromium.
 dirs_to_clone = {}
 
 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)):
       print "removing directory %s" % dest_dir
       system(["git", "rm", "-r", dest_dir], cwd=chromium_dir)
     print "cloning directory %s into %s" % (input_dir, dest_dir)
     files = system(["git", "ls-files", input_dir], cwd=source_dir)
     for f in files.splitlines():
       # Don't copy presubmit files over since the code is read-only on the
       # chromium side.
@@ skipping 24 matching lines @@
   system(["git", "add", version_filename], cwd=chromium_dir)
 
   # Reset preserved files that were blown away.
   for rel_path in preserved_chromium_files:
     preserved_path = os.path.join(sdk_prefix_in_chromium, rel_path)
     system(["git", "reset", "--", preserved_path])
     system(["git", "checkout", preserved_path])
 
   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)
+