diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-31 12:08:13 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-31 12:08:13 +0100 |
| commit | d52d6a84a5dc0ba5264915b2e1524f65d1841b3b (patch) | |
| tree | d5893e908df0873ddf8baae3ec190d4d00f7c79d /chromium/tools | |
| parent | c03217fbee001280f4d23fa67f07496c219aeac0 (diff) | |
| download | android_frameworks_webview-d52d6a84a5dc0ba5264915b2e1524f65d1841b3b.tar.gz android_frameworks_webview-d52d6a84a5dc0ba5264915b2e1524f65d1841b3b.tar.bz2 android_frameworks_webview-d52d6a84a5dc0ba5264915b2e1524f65d1841b3b.zip | |
Merge scripts: add LASTCHANGE.blink.
Create build/util/LASTCHANGE.blink when merging, containing the last
version of Blink merged into third_party/WebKit. This is used to
generate version header files.
Change-Id: I3ddf5be9081d06541c48713db88a47ca0d37b33e
Diffstat (limited to 'chromium/tools')
| -rwxr-xr-x | chromium/tools/merge_from_chromium.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/chromium/tools/merge_from_chromium.py b/chromium/tools/merge_from_chromium.py index cffd044..4a5702c 100755 --- a/chromium/tools/merge_from_chromium.py +++ b/chromium/tools/merge_from_chromium.py @@ -324,6 +324,12 @@ def _GenerateLastChange(svn_revision): 'w') as f: f.write('LASTCHANGE=%s\n' % svn_revision) merge_common.GetCommandStdout(['git', 'add', '-f', 'build/util/LASTCHANGE']) + logging.debug('Updating LASTCHANGE.blink ...') + with open(os.path.join(merge_common.REPOSITORY_ROOT, + 'build/util/LASTCHANGE.blink'), 'w') as f: + f.write('LASTCHANGE=%s\n' % _GetBlinkRevision()) + merge_common.GetCommandStdout(['git', 'add', '-f', + 'build/util/LASTCHANGE.blink']) if _ModifiedFilesInIndex(): merge_common.GetCommandStdout([ 'git', 'commit', '-m', @@ -396,6 +402,13 @@ def _GetSVNRevisionAndSHA1(git_branch, svn_revision, sha1=None): return (svn_revision, sha1) +def _GetBlinkRevision(): + commit = merge_common.GetCommandStdout([ + 'git', 'log', '-n1', '--grep=git-svn-id:', '--format=%H%n%b'], + cwd=os.path.join(merge_common.REPOSITORY_ROOT, 'third_party', 'WebKit')) + return _ParseSvnRevisionFromGitCommitMessage(commit) + + def Snapshot(svn_revision, root_sha1, unattended): """Takes a snapshot of the Chromium tree and merges it into Android. |