commit a695c30c8618b948d714a2a8161ee6a2ab98d0ce
author Hans Wennborg <hans@chromium.org> Fri Feb 09 12:48:33 2018
committer Commit Bot <commit-bot@chromium.org> Fri Feb 09 12:48:33 2018
tree 49c70e09b42cc54cf46045f2074e97cc2a1d6b50
parent 7c6255f1489ae4cc745aa732c5d235050ad80034

Roll clang 321529:324578

This changes the Clang version number from 6.0.0 to 7.0.0.

Bug: 803661

Change-Id: Ib717cadcb3873d6dc3e49267629f7ffc1acf1df7
Reviewed-on: https://chromium-review.googlesource.com/903927
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#535693}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: ca5066b992b8a05e6a3df042f2c0e1766e13a565

scripts/update.py

diff --git a/scripts/update.py b/scripts/update.py
index cab981e..de21496 100755
--- a/scripts/update.py
+++ b/scripts/update.py
@@ -27,7 +27,7 @@
 # Do NOT CHANGE this if you don't know what you're doing -- see
 # https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md
 # Reverting problematic clang rolls is safe, though.
-CLANG_REVISION = '321529'
+CLANG_REVISION = '324578'
 
 use_head_revision = bool(os.environ.get('LLVM_FORCE_HEAD_REVISION', '0')
                          in ('1', 'YES'))
@@ -35,7 +35,7 @@
   CLANG_REVISION = 'HEAD'
 
 # This is incremented when pushing a new build of Clang at the same revision.
-CLANG_SUB_REVISION=2
+CLANG_SUB_REVISION=1
 
 PACKAGE_VERSION = "%s-%s" % (CLANG_REVISION, CLANG_SUB_REVISION)
 
@@ -68,7 +68,7 @@
     os.path.join(LLVM_DIR, '..', 'llvm-build-tools'))
 STAMP_FILE = os.path.normpath(
     os.path.join(LLVM_DIR, '..', 'llvm-build', 'cr_build_revision'))
-VERSION = '6.0.0'
+VERSION = '7.0.0'
 ANDROID_NDK_DIR = os.path.join(
     CHROMIUM_DIR, 'third_party', 'android_ndk')
 
@@ -888,11 +888,6 @@
       args.force_local_build):
     AddSvnToPathOnWin()
 
-  if use_head_revision:
-    # TODO(hans): Trunk was updated; remove after the next roll.
-    global VERSION
-    VERSION = '7.0.0'
-
   global CLANG_REVISION, PACKAGE_VERSION
   if args.print_revision:
     if use_head_revision or args.llvm_force_head_revision: