From 8c27af21361c320cf5df836cd9f3486dfd5a4983 Mon Sep 17 00:00:00 2001 From: Dmitrii Ishcheikin Date: Fri, 7 Jun 2024 13:06:19 +0000 Subject: [PATCH 1/2] Revert^7 "Upgrade to clang-r522817" 36c6af6bd2e11ee2e538c9b56749fc7bd57eebd3 Change-Id: Id3320a7862f1ebbfe49bfa4caa36e7ccfd515524 --- 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 62a4765f4..290a27dfb 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -300,9 +300,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 @@ -310,9 +307,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{} @@ -397,7 +391,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. From 8517b8cd87e4f866ec01d3efb0bf6f9f8024e284 Mon Sep 17 00:00:00 2001 From: Dmitrii Ishcheikin Date: Fri, 7 Jun 2024 13:06:19 +0000 Subject: [PATCH 2/2] Revert "rustc-1.78.0 Build 11910258" Revert submission 3108411-rust-update-prebuilts-1.78.0 Reason for revert: b/345708905 Reverted changes: /q/submissionid:3108411-rust-update-prebuilts-1.78.0 Change-Id: I66b95447ddfcb3d35e5f4305a6d9feb2896fbdf7 --- rust/config/global.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/config/global.go b/rust/config/global.go index 6943467b0..e83e23aa5 100644 --- a/rust/config/global.go +++ b/rust/config/global.go @@ -24,7 +24,7 @@ import ( var ( pctx = android.NewPackageContext("android/soong/rust/config") - RustDefaultVersion = "1.78.0" + RustDefaultVersion = "1.77.1.p1" RustDefaultBase = "prebuilts/rust/" DefaultEdition = "2021" Stdlibs = []string{