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

Merge "Revert "Update clang version to clang-r487747"" am: cec8b2c0b7

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

Change-Id: I9816aab9c3ea5503131487752651d293c8750cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yi Kong
2023-03-02 09:54:15 +00:00
committed by Automerger Merge Worker
parent e21c6d4c49 cec8b2c0b7
commit 1336c0f767
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/config.go
View File

@@ -1359,11 +1359,6 @@ 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,10 +192,6 @@ 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",
@@ -257,7 +253,6 @@ 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
@@ -310,8 +305,8 @@ var (
// prebuilts/clang default settings. // prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host" ClangDefaultBase = "prebuilts/clang/host"
ClangDefaultVersion = "clang-r487747" ClangDefaultVersion = "clang-r475365b"
ClangDefaultShortVersion = "17" ClangDefaultShortVersion = "16.0.2"
// Directories with warnings from Android.bp files. // Directories with warnings from Android.bp files.
WarningAllowedProjects = []string{ WarningAllowedProjects = []string{