Merge "Revert^2 "Update clang version to clang-r487747""
This commit is contained in:
@@ -1385,6 +1385,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
|
||||||
}
|
}
|
||||||
|
@@ -255,6 +255,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
|
||||||
@@ -304,8 +305,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{
|
||||||
|
@@ -29,7 +29,7 @@ var (
|
|||||||
defaultBindgenFlags = []string{""}
|
defaultBindgenFlags = []string{""}
|
||||||
|
|
||||||
// bindgen should specify its own Clang revision so updating Clang isn't potentially blocked on bindgen failures.
|
// bindgen should specify its own Clang revision so updating Clang isn't potentially blocked on bindgen failures.
|
||||||
bindgenClangVersion = "clang-r475365b"
|
bindgenClangVersion = "clang-r487747"
|
||||||
|
|
||||||
_ = pctx.VariableFunc("bindgenClangVersion", func(ctx android.PackageVarContext) string {
|
_ = pctx.VariableFunc("bindgenClangVersion", func(ctx android.PackageVarContext) string {
|
||||||
if override := ctx.Config().Getenv("LLVM_BINDGEN_PREBUILTS_VERSION"); override != "" {
|
if override := ctx.Config().Getenv("LLVM_BINDGEN_PREBUILTS_VERSION"); override != "" {
|
||||||
|
Reference in New Issue
Block a user