Merge "Update clang to build 4579689." into ndk-release-r17

MIPS · Feb 23, 2018 · fbaf921 · fbaf921
2 parents adcc0f4 + df44e99
commit fbaf921
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,7 +32,7 @@ Announcements
 NDK
 ---
 
- * Updated Clang to build 4479392.
+ * Updated Clang to build 4579689.
      * LTO now works on Windows, fixing [Issue 313].
  * Updated gtest to upstream revision 0fe96607d85cf3a25ac40da369db62bbee2939a5.
  * `libandroid_support` is no longer used when your NDK API level is greater

diff --git a/build/core/sanitizers.mk b/build/core/sanitizers.mk
@@ -20,7 +20,7 @@ ifeq ($(HOST_ARCH64),x86)
 endif
 
 NDK_TOOLCHAIN_LIB_DIR := \
-    $(LLVM_TOOLCHAIN_PREBUILT_ROOT)/lib$(NDK_TOOLCHAIN_LIB_SUFFIX)/clang/5.0.2/lib/linux
+    $(LLVM_TOOLCHAIN_PREBUILT_ROOT)/lib$(NDK_TOOLCHAIN_LIB_SUFFIX)/clang/6.0.1/lib/linux
 
 NDK_APP_ASAN := $(NDK_APP_DST_DIR)/$(TARGET_ASAN_BASENAME)
 NDK_APP_UBSAN := $(NDK_APP_DST_DIR)/$(TARGET_UBSAN_BASENAME)

diff --git a/build/tools/prebuilt-common.sh b/build/tools/prebuilt-common.sh
@@ -1272,7 +1272,7 @@ get_llvm_toolchain_binprefix ()
 {
     local NAME DIR BINPREFIX
     local SYSTEM=${1:-$(get_prebuilt_host_tag)}
-    local VERSION=4479392
+    local VERSION=4579689
     SYSTEM=${SYSTEM%_64} # Trim _64 suffix. We only have one LLVM.
     BINPREFIX=$ANDROID_BUILD_TOP/prebuilts/clang/host/$SYSTEM/clang-$VERSION/bin
     echo "$BINPREFIX"

diff --git a/checkbuild.py b/checkbuild.py
@@ -254,7 +254,7 @@ def _install_file(src_file, dst_file):
 class Clang(ndk.builds.Module):
     name = 'clang'
     path = 'toolchains/llvm/prebuilt/{host}'
-    version = 'clang-4479392'
+    version = 'clang-4579689'
 
     def get_prebuilt_path(self, host):
         # The 32-bit Windows Clang is a part of the 64-bit Clang package in