StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update clang version to clang-r487747"

Browse Source
This commit is contained in:
Yi Kong
2023-03-01 05:02:15 +00:00
committed by Gerrit Code Review
parent 0f0d3ce49c 836690b593
commit 29ff4182f5
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/config.go
View File

@@ -1363,6 +1363,11 @@ func (c *deviceConfig) NativeCoverageEnabledForPath(path string) bool {
} }
} }
if coverage && len(c.config.productVariables.NativeCoverageExcludePaths) > 0 { 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) { if HasAnyPrefix(path, c.config.productVariables.NativeCoverageExcludePaths) {
coverage = false coverage = false
} }

9
cc/config/global.go
View File

@@ -192,6 +192,10 @@ var (
} }
noOverrideGlobalCflags = []string{ noOverrideGlobalCflags = []string{
// Workaround for boot loop caused by stack protector.
// http://b/267839238
"-mllvm -disable-check-noreturn-call",
"-Werror=bool-operation", "-Werror=bool-operation",
"-Werror=implicit-int-float-conversion", "-Werror=implicit-int-float-conversion",
"-Werror=int-in-bool-context", "-Werror=int-in-bool-context",
@@ -253,6 +257,7 @@ var (
"-Wno-bitwise-instead-of-logical", "-Wno-bitwise-instead-of-logical",
"-Wno-misleading-indentation", "-Wno-misleading-indentation",
"-Wno-array-parameter", "-Wno-array-parameter",
"-Wno-gnu-offsetof-extensions",
} }
// Extra cflags for external third-party projects to disable warnings that // Extra cflags for external third-party projects to disable warnings that
@@ -305,8 +310,8 @@ var (
// prebuilts/clang default settings. // prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host" ClangDefaultBase = "prebuilts/clang/host"
ClangDefaultVersion = "clang-r475365b" ClangDefaultVersion = "clang-r487747"
ClangDefaultShortVersion = "16.0.2" ClangDefaultShortVersion = "17"
// Directories with warnings from Android.bp files. // Directories with warnings from Android.bp files.
WarningAllowedProjects = []string{ WarningAllowedProjects = []string{