diff options
| author | Stephen Hines <srhines@google.com> | 2018-02-06 19:10:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-06 19:10:36 +0000 |
| commit | ecdf4a5996a9e62e3b44c5bfe9304f92adcae813 (patch) | |
| tree | a1262aff77fdd389f30ee2fae2d8c2fbb2309d9f /cc/config | |
| parent | 438a714559a8ab7bb73805315f62c2e50fda4a6f (diff) | |
| parent | b6b386bf91c4e6905dc48ab234bedc8a1a88cb3b (diff) | |
| download | build_soong-ecdf4a5996a9e62e3b44c5bfe9304f92adcae813.tar.gz build_soong-ecdf4a5996a9e62e3b44c5bfe9304f92adcae813.tar.bz2 build_soong-ecdf4a5996a9e62e3b44c5bfe9304f92adcae813.zip | |
Merge "Switch to clang-4579689." am: fa54e751d9 am: 3bcedd91cf
am: b6b386bf91
Change-Id: Ide6a047fae76ba61b5a755ca74a927c1128a1c91
Diffstat (limited to 'cc/config')
| -rw-r--r-- | cc/config/clang.go | 13 | ||||
| -rw-r--r-- | cc/config/global.go | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/cc/config/clang.go b/cc/config/clang.go index 302c68ee..004840ad 100644 --- a/cc/config/clang.go +++ b/cc/config/clang.go @@ -148,6 +148,19 @@ func init() { // fixed. //"-Werror=null-dereference", "-Werror=return-type", + + // http://b/72331526 Disable -Wtautological-* until the instances detected by these + // new warnings are fixed. + "-Wno-error=tautological-constant-compare", + + // http://b/72331524 Allow null pointer arithmetic until the instances detected by + // this new warning are fixed. + "-Wno-error=null-pointer-arithmetic", + + // http://b/72330874 Disable -Wenum-compare until the instances detected by this new + // warning are fixed. + "-Wno-error=enum-compare", + "-Wno-error=enum-compare-switch", }, " ")) } diff --git a/cc/config/global.go b/cc/config/global.go index 0934efad..f06d0bd3 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -116,8 +116,8 @@ var ( // prebuilts/clang default settings. ClangDefaultBase = "prebuilts/clang/host" - ClangDefaultVersion = "clang-4393122" - ClangDefaultShortVersion = "5.0.1" + ClangDefaultVersion = "clang-4579689" + ClangDefaultShortVersion = "6.0.1" // Directories with warnings from Android.bp files. WarningAllowedProjects = []string{ |