summaryrefslogtreecommitdiffstats
path: root/mojo/tools/rev_sdk.py
diff options
context:
space:
mode:
authorSteven Holte <holte@google.com>2015-05-21 19:15:01 -0700
committerSteven Holte <holte@google.com>2015-05-22 02:16:14 +0000
commit0774f95f34b869875cfa0191175d50fe9a297c4a (patch)
treefde5ab3fb24523effb92f2b1d9ebf02a49e0d5fd /mojo/tools/rev_sdk.py
parent756e41dd2b2d12bc8ce56db44ac950e6713f4a30 (diff)
downloadchromium_src-0774f95f34b869875cfa0191175d50fe9a297c4a.zip
chromium_src-0774f95f34b869875cfa0191175d50fe9a297c4a.tar.gz
chromium_src-0774f95f34b869875cfa0191175d50fe9a297c4a.tar.bz2
Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f"
This appears to cause build failure. http://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN%20%28dbg%29/builds/1908 This reverts commit 8ddc364fd10bcfe1a4332f0f66be4e5db84e39b6. TBR=rockot,jam BUG= Review URL: https://codereview.chromium.org/1157573002 Cr-Commit-Position: refs/heads/master@{#331047}
Diffstat (limited to 'mojo/tools/rev_sdk.py')
-rwxr-xr-xmojo/tools/rev_sdk.py20
1 files changed, 6 insertions, 14 deletions
diff --git a/mojo/tools/rev_sdk.py b/mojo/tools/rev_sdk.py
index 06241ee..15812c5 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",
- "mojo/public/java/application",
+ "third_party/mojo/src/mojo/public/java/application",
]
# Individual files to preserve within the target repository during roll. These
@@ -43,9 +43,8 @@ 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, mojo_revision):
- src_commit = system(["git", "rev-parse", mojo_revision],
- cwd=source_dir).strip()
+def rev(source_dir, chromium_dir):
+ src_commit = system(["git", "show-ref", "HEAD", "-s"], 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)):
@@ -90,15 +89,8 @@ def rev(source_dir, chromium_dir, mojo_revision):
commit("Update mojo sdk to rev " + src_commit, cwd=chromium_dir)
-if len(sys.argv) < 2:
- print "usage: rev_sdk.py <mojo source dir> [<mojo revision>]"
+if len(sys.argv) != 2:
+ print "usage: rev_sdk.py <mojo source dir>"
sys.exit(1)
-# 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)
-
+rev(sys.argv[1], chromium_root_dir)