Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5659921c authored by Yabin Cui's avatar Yabin Cui Committed by Automerger Merge Worker
Browse files

Merge "Revert "Switch to clang r428724 13.0.1."" am: 01cad0cd am: 04d221ad 

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

Change-Id: Iaa0bbd11a3ab4b60e0de49a814f55c7dd6570793
parents 1d0eb600 04d221ad

cc/config/global.go

+2 −4
Original line number Diff line number Diff line
@@ -228,8 +228,6 @@ var ( 
		"-Wno-non-c-typedef-for-linkage", // http://b/161304145

		// New warnings to be fixed after clang-r407598

		"-Wno-string-concatenation", // http://b/175068488

		// New warnings to be fixed after clang-r428724

		"-Wno-align-mismatch", // http://b/193679946

	}



	// Extra cflags for external third-party projects to disable warnings that
@@ -268,8 +266,8 @@ var ( 


	// prebuilts/clang default settings.

	ClangDefaultBase         = "prebuilts/clang/host"

	ClangDefaultVersion      = "clang-r428724"

	ClangDefaultShortVersion = "13.0.1"

	ClangDefaultVersion      = "clang-r416183b1"

	ClangDefaultShortVersion = "12.0.7"



	// Directories with warnings from Android.bp files.

	WarningAllowedProjects = []string{

cc/tidy.go

+0 −2
Original line number Diff line number Diff line
@@ -146,8 +146,6 @@ func (tidy *tidyFeature) flags(ctx ModuleContext, flags Flags) Flags { 
	tidyChecks = tidyChecks + ",-bugprone-signed-char-misuse"

	// http://b/155034972

	tidyChecks = tidyChecks + ",-bugprone-branch-clone"

	// http://b/193716442

	tidyChecks = tidyChecks + ",-bugprone-implicit-widening-of-multiplication-result"

	flags.TidyFlags = append(flags.TidyFlags, tidyChecks)



	if ctx.Config().IsEnvTrue("WITH_TIDY") {