Merge "Move -Wno-inconsistent-missing-override to ClangExtraCflags" am: 2e03bb7296

am: 16bb6c063d

Change-Id: I857212fc41601d918f57809eb2855316c8a8d640
This commit is contained in:
Yi Kong
2019-03-28 15:53:18 -07:00
committed by android-build-merger

View File

@@ -129,13 +129,13 @@ func init() {
// Warnings from clang-8.0
"-Wno-defaulted-function-deleted",
}, " "))
pctx.StaticVariable("ClangExtraCppflags", strings.Join([]string{
// Disable -Winconsistent-missing-override until we can clean up the existing
// codebase for it.
"-Wno-inconsistent-missing-override",
}, " "))
pctx.StaticVariable("ClangExtraCppflags", strings.Join([]string{
// 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",