From 0ed7d24f7a3b25b16268b0aaa5492d6c67270324 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Wed, 4 Oct 2017 16:12:37 -0700 Subject: [PATCH] Switch to clang-4393122. Bug: http://b/62580008 Bug: http://b/68236239 Bug: http://b/68236396 Test: https://goto.google.com/clang-4393122-testing Change-Id: Ib6bcf93e356172aad2a762b730a6f93916a5d845 --- cc/config/clang.go | 6 ++++++ cc/config/global.go | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cc/config/clang.go b/cc/config/clang.go index 64bb96ea2..6f08fa914 100644 --- a/cc/config/clang.go +++ b/cc/config/clang.go @@ -97,6 +97,12 @@ func init() { // http://b/29823425 Disable -Wexpansion-to-defined for Clang update to r271374 "-Wno-expansion-to-defined", + // http://b/68236239 Allow 0/NULL instead of using nullptr everywhere. + "-Wno-zero-as-null-pointer-constant", + + // http://b/68236396 Allow unknown warning options. + "-Wno-unknown-warning-option", + // http://b/36463318 Clang executes with an absolute path, so clang-provided // headers are now absolute. "-fdebug-prefix-map=$$PWD/=", diff --git a/cc/config/global.go b/cc/config/global.go index e9f5473e6..dae218c16 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -77,8 +77,8 @@ var ( // prebuilts/clang default settings. ClangDefaultBase = "prebuilts/clang/host" - ClangDefaultVersion = "clang-4053586" - ClangDefaultShortVersion = "5.0" + ClangDefaultVersion = "clang-4393122" + ClangDefaultShortVersion = "5.0.1" ) var pctx = android.NewPackageContext("android/soong/cc/config")