Revert "Update clang version to clang-r487747"
Revert submission 2446165-update-clang-r487747
Reason for revert: DroidMonitor-triggered revert due to breakage bug b/271252582 and b/271243811
Reverted changes: /q/submissionid:2446165-update-clang-r487747
Bug: 271252582
Bug: 271243811
Change-Id: I3b5c44982d268b5c6c3db39e7af4d7aa7c6dfbf7
diff --git a/android/config.go b/android/config.go
index adab93b..c0f84c8 100644
--- a/android/config.go
+++ b/android/config.go
@@ -1363,11 +1363,6 @@
}
}
if coverage && len(c.config.productVariables.NativeCoverageExcludePaths) > 0 {
- // Workaround coverage boot failure.
- // http://b/269981180
- if strings.HasPrefix(path, "external/protobuf") {
- coverage = false
- }
if HasAnyPrefix(path, c.config.productVariables.NativeCoverageExcludePaths) {
coverage = false
}
diff --git a/cc/config/global.go b/cc/config/global.go
index d65f883..05dc773 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -192,10 +192,6 @@
}
noOverrideGlobalCflags = []string{
- // Workaround for boot loop caused by stack protector.
- // http://b/267839238
- "-mllvm -disable-check-noreturn-call",
-
"-Werror=bool-operation",
"-Werror=implicit-int-float-conversion",
"-Werror=int-in-bool-context",
@@ -257,7 +253,6 @@
"-Wno-bitwise-instead-of-logical",
"-Wno-misleading-indentation",
"-Wno-array-parameter",
- "-Wno-gnu-offsetof-extensions",
}
// Extra cflags for external third-party projects to disable warnings that
@@ -310,8 +305,8 @@
// prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host"
- ClangDefaultVersion = "clang-r487747"
- ClangDefaultShortVersion = "17"
+ ClangDefaultVersion = "clang-r475365b"
+ ClangDefaultShortVersion = "16.0.2"
// Directories with warnings from Android.bp files.
WarningAllowedProjects = []string{