Merge "Revert^5 "Upgrade to clang-r522817"" into main am: 728e9178bd am: 67ced9c270
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3092263
Change-Id: I72e045acb6f5da665482f19a1d11481c91650b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cc/config/global.go b/cc/config/global.go
index ffd6d7e..16b5e09 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -295,9 +295,6 @@
// New warnings to be fixed after clang-r475365
"-Wno-error=single-bit-bitfield-constant-conversion", // http://b/243965903
"-Wno-error=enum-constexpr-conversion", // http://b/243964282
- // New warnings to be fixed after clang-r522817
- "-Wno-error=invalid-offsetof",
- "-Wno-error=thread-safety-reference-return",
// Irrelevant on Android because _we_ don't use exceptions, but causes
// lots of build noise because libcxx/libcxxabi do. This can probably
@@ -305,9 +302,6 @@
// until then because it causes warnings in the _callers_, not the
// project itself.
"-Wno-deprecated-dynamic-exception-spec",
-
- // Allow using VLA CXX extension.
- "-Wno-vla-cxx-extension",
}
noOverride64GlobalCflags = []string{}
@@ -392,7 +386,7 @@
// prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host"
- ClangDefaultVersion = "clang-r522817"
+ ClangDefaultVersion = "clang-r510928"
ClangDefaultShortVersion = "18"
// Directories with warnings from Android.bp files.