Merge "Revert^6 "Upgrade to clang-r522817"" into main

This commit is contained in:
Chris Wailes 2024-06-07 03:31:39 +00:00 committed by Gerrit Code Review
commit 86cbd9e46d

View file

@ -300,6 +300,9 @@ var (
// New warnings to be fixed after clang-r475365 // New warnings to be fixed after clang-r475365
"-Wno-error=single-bit-bitfield-constant-conversion", // http://b/243965903 "-Wno-error=single-bit-bitfield-constant-conversion", // http://b/243965903
"-Wno-error=enum-constexpr-conversion", // http://b/243964282 "-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 // Irrelevant on Android because _we_ don't use exceptions, but causes
// lots of build noise because libcxx/libcxxabi do. This can probably // lots of build noise because libcxx/libcxxabi do. This can probably
@ -307,6 +310,9 @@ var (
// until then because it causes warnings in the _callers_, not the // until then because it causes warnings in the _callers_, not the
// project itself. // project itself.
"-Wno-deprecated-dynamic-exception-spec", "-Wno-deprecated-dynamic-exception-spec",
// Allow using VLA CXX extension.
"-Wno-vla-cxx-extension",
} }
noOverride64GlobalCflags = []string{} noOverride64GlobalCflags = []string{}
@ -391,7 +397,7 @@ var (
// prebuilts/clang default settings. // prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host" ClangDefaultBase = "prebuilts/clang/host"
ClangDefaultVersion = "clang-r510928" ClangDefaultVersion = "clang-r522817"
ClangDefaultShortVersion = "18" ClangDefaultShortVersion = "18"
// Directories with warnings from Android.bp files. // Directories with warnings from Android.bp files.