From 33fb50727179272420860ddf6245a718382c8f00 Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Mon, 22 Apr 2024 23:04:07 +0000 Subject: [PATCH] Revert^3 "Upgrade to clang-r522817" This reverts commit 7a4012586b1affb08a084d0379c02215873d242b. Still more build breakages... Change-Id: I2081d68e37bf260da78c651bb8fb9ae0d05b4c37 --- cc/config/global.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/cc/config/global.go b/cc/config/global.go index ffd6d7ee9..16b5e0938 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -295,9 +295,6 @@ 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 @@ -305,9 +302,6 @@ 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{} @@ -392,7 +386,7 @@ var ( // prebuilts/clang default settings. ClangDefaultBase = "prebuilts/clang/host" - ClangDefaultVersion = "clang-r522817" + ClangDefaultVersion = "clang-r510928" ClangDefaultShortVersion = "18" // Directories with warnings from Android.bp files.