Merge "Revert "Update clang version to clang-r510928"" into main am: f166df7efd

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2937811

Change-Id: I0fe4028c8b633dbe4850c04f9ffcc868420d5c48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-01-31 13:57:57 +00:00
committed by Automerger Merge Worker
2 changed files with 3 additions and 15 deletions

View File

@@ -253,14 +253,6 @@ var (
// http://b/161386391 for -Wno-pointer-to-int-cast
"-Wno-pointer-to-int-cast",
"-Werror=fortify-source",
// http://b/315246135 temporarily disabled
"-Wno-error=unused-variable",
// http://b/315250603 temporarily disabled
"-Wno-error=format",
// Disabled because it produces many false positives. http://b/323050926
"-Wno-missing-field-initializers",
// http://b/323050889
"-Wno-packed-non-pod",
"-Werror=address-of-temporary",
"-Werror=incompatible-function-pointer-types",
@@ -339,8 +331,6 @@ var (
"-Wno-unused",
"-Wno-deprecated",
"-Wno-tautological-negation-compare",
"-Wno-tautological-undefined-compare",
}
// Similar to noOverrideGlobalCflags, but applies only to third-party code
@@ -366,8 +356,6 @@ var (
"-Wno-unqualified-std-cast-call",
"-Wno-array-parameter",
"-Wno-gnu-offsetof-extensions",
// TODO: Enable this warning http://b/315245071
"-Wno-fortify-source",
}
llvmNextExtraCommonGlobalCflags = []string{
@@ -387,8 +375,8 @@ var (
// prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host"
ClangDefaultVersion = "clang-r510928"
ClangDefaultShortVersion = "18"
ClangDefaultVersion = "clang-r498229b"
ClangDefaultShortVersion = "17"
// Directories with warnings from Android.bp files.
WarningAllowedProjects = []string{

View File

@@ -29,7 +29,7 @@ var (
defaultBindgenFlags = []string{""}
// bindgen should specify its own Clang revision so updating Clang isn't potentially blocked on bindgen failures.
bindgenClangVersion = "clang-r510928"
bindgenClangVersion = "clang-r498229b"
_ = pctx.VariableFunc("bindgenClangVersion", func(ctx android.PackageVarContext) string {
if override := ctx.Config().Getenv("LLVM_BINDGEN_PREBUILTS_VERSION"); override != "" {