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

Commit 562a9080 authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Switch to clang r433403" am: 6afa749d am: 7d927b62 

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

Change-Id: I7d63d5a1a06c54d5672c625d4ad6713e5ece95fa
parents ae5963a6 7d927b62

cc/config/global.go

+8 −2
Original line number Diff line number Diff line
@@ -230,6 +230,9 @@ var ( 
		"-Wno-string-concatenation", // http://b/175068488

		// New warnings to be fixed after clang-r428724

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

		// New warnings to be fixed after clang-r433403

		"-Wno-error=unused-but-set-variable",  // http://b/197240255

		"-Wno-error=unused-but-set-parameter", // http://b/197240255

	}



	// Extra cflags for external third-party projects to disable warnings that
@@ -255,6 +258,9 @@ var ( 


		// http://b/165945989

		"-Wno-psabi",



		// http://b/199369603

		"-Wno-null-pointer-subtraction",

	}



	IllegalFlags = []string{
@@ -268,8 +274,8 @@ var ( 


	// prebuilts/clang default settings.

	ClangDefaultBase         = "prebuilts/clang/host"

	ClangDefaultVersion      = "clang-r428724"

	ClangDefaultShortVersion = "13.0.1"

	ClangDefaultVersion      = "clang-r433403"

	ClangDefaultShortVersion = "13.0.2"



	// Directories with warnings from Android.bp files.

	WarningAllowedProjects = []string{

cc/tidy.go

+3 −0
Original line number Diff line number Diff line
@@ -148,6 +148,9 @@ func (tidy *tidyFeature) flags(ctx ModuleContext, flags Flags) Flags { 
	tidyChecks = tidyChecks + ",-bugprone-branch-clone"

	// http://b/193716442

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

	// Too many existing functions trigger this rule, and fixing it requires large code

	// refactoring. The cost of maintaining this tidy rule outweighs the benefit it brings.

	tidyChecks = tidyChecks + ",-bugprone-easily-swappable-parameters"

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



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