Merge changes from topics "soong_zip", "zip2zip-bp2build"
* changes:
Add zip2zip alias and allowlist unblocked rdeps.
Add a soong_zip alias to prebuilts and allowlist all blocked rdeps.
diff --git a/cc/config/global.go b/cc/config/global.go
index bf80907..a7701b9 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -244,10 +244,6 @@
"-Wno-error=unused-but-set-parameter", // http://b/197240255
// New warnings to be fixed after clang-r458507
"-Wno-error=unqualified-std-cast-call", // http://b/239662094
- // New warnings to be fixed after clang-r468909
- "-Wno-error=array-parameter", // http://b/241941550
- "-Wno-error=deprecated-builtins", // http://b/241601211
- "-Wno-error=deprecated", // in external/googletest/googletest
}
noOverrideExternalGlobalCflags = []string{
@@ -312,8 +308,8 @@
// prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host"
- ClangDefaultVersion = "clang-r468909"
- ClangDefaultShortVersion = "15.0.2"
+ ClangDefaultVersion = "clang-r458507"
+ ClangDefaultShortVersion = "15.0.1"
// Directories with warnings from Android.bp files.
WarningAllowedProjects = []string{