From 7a4012586b1affb08a084d0379c02215873d242b Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Mon, 22 Apr 2024 07:22:02 +0000 Subject: [PATCH] Revert^2 "Upgrade to clang-r522817" This reverts commit 321dd23b345c56eb2844888d977fd05b59f0ec0c. Breakage is fixed by https://r.android.com/3051002. Change-Id: I70925c7aa01fb78ec701971ee97192993aef0edd Test: abtd Bug: 322868540 --- cc/config/global.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cc/config/global.go b/cc/config/global.go index 16b5e0938..ffd6d7ee9 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -295,6 +295,9 @@ var ( // 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 @@ -302,6 +305,9 @@ var ( // 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{} @@ -386,7 +392,7 @@ var ( // prebuilts/clang default settings. ClangDefaultBase = "prebuilts/clang/host" - ClangDefaultVersion = "clang-r510928" + ClangDefaultVersion = "clang-r522817" ClangDefaultShortVersion = "18" // Directories with warnings from Android.bp files.