aboutsummaryrefslogtreecommitdiffstats
path: root/cc/config
diff options
context:
space:
mode:
authorYi Kong <yikong@google.com>2019-01-13 17:58:29 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-13 17:58:29 -0800
commit61bf801cee945e359524afb206c4e708ee198676 (patch)
treea843275383fdf6cb15aa851437ab7acd0731024a /cc/config
parent5b1140918e6c3ecc4d9c43a428f4bd8c5f3f5abb (diff)
parent92071899bda6acc33d60660d676137340d2dc255 (diff)
downloadbuild_soong-61bf801cee945e359524afb206c4e708ee198676.tar.gz
build_soong-61bf801cee945e359524afb206c4e708ee198676.tar.bz2
build_soong-61bf801cee945e359524afb206c4e708ee198676.zip
Merge "Move -Wno-null-dereference to external only" am: 98975c301e am: 52e8b1e270
am: 92071899bd Change-Id: I625b6d560ed0c8c49c1064a3bedb2d3c7b6858bd
Diffstat (limited to 'cc/config')
-rw-r--r--cc/config/clang.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/config/clang.go b/cc/config/clang.go
index fd555075..bfa7873a 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -135,10 +135,6 @@ func init() {
// codebase for it.
"-Wno-inconsistent-missing-override",
- // Bug: http://b/29823425 Disable -Wnull-dereference until the
- // new instances detected by this warning are fixed.
- "-Wno-null-dereference",
-
// Enable clang's thread-safety annotations in libcxx.
// Turn off -Wthread-safety-negative, to avoid breaking projects that use -Weverything.
"-D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS",
@@ -184,6 +180,10 @@ func init() {
// http://b/72331524 Allow null pointer arithmetic until the instances detected by
// this new warning are fixed.
"-Wno-null-pointer-arithmetic",
+
+ // Bug: http://b/29823425 Disable -Wnull-dereference until the
+ // new instances detected by this warning are fixed.
+ "-Wno-null-dereference",
}, " "))
}