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

Commit 74d25e39 authored by Yabin Cui's avatar Yabin Cui Committed by Gerrit Code Review
Browse files

Merge "Switch to clang-r383902 (11.0.1)."

parents 6dfe30a5 8ec05ff5
Loading
Loading
Loading
Loading
+13 −3
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ var ClangUnknownCflags = sorted([]string{
	"-Wunused-but-set-parameter",
	"-Wunused-but-set-variable",
	"-fdiagnostics-color",
	// http://b/153759688
	"-fuse-init-array",

	// arm + arm64
	"-fgcse-after-reload",
@@ -113,9 +115,6 @@ func init() {
		// color codes if it is not running in a terminal.
		"-fcolor-diagnostics",

		// http://b/68236239 Allow 0/NULL instead of using nullptr everywhere.
		"-Wno-zero-as-null-pointer-constant",

		// Warnings from clang-7.0
		"-Wno-sign-compare",

@@ -166,6 +165,17 @@ func init() {
		"-Wno-int-in-bool-context",          // http://b/148287349
		"-Wno-sizeof-array-div",             // http://b/148815709
		"-Wno-tautological-overlap-compare", // http://b/148815696
		// New warnings to be fixed after clang-r383902.
		"-Wno-deprecated-copy",                      // http://b/153746672
		"-Wno-range-loop-construct",                 // http://b/153747076
		"-Wno-misleading-indentation",               // http://b/153746954
		"-Wno-zero-as-null-pointer-constant",        // http://b/68236239
		"-Wno-deprecated-anon-enum-enum-conversion", // http://b/153746485
		"-Wno-deprecated-enum-enum-conversion",      // http://b/153746563
		"-Wno-string-compare",                       // http://b/153764102
		"-Wno-enum-enum-conversion",                 // http://b/154138986
		"-Wno-enum-float-conversion",                // http://b/154255917
		"-Wno-pessimizing-move",                     // http://b/154270751
	}, " "))

	// Extra cflags for external third-party projects to disable warnings that
+2 −2
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ var (

	// prebuilts/clang default settings.
	ClangDefaultBase         = "prebuilts/clang/host"
	ClangDefaultVersion      = "clang-r377782d"
	ClangDefaultShortVersion = "10.0.6"
	ClangDefaultVersion      = "clang-r383902"
	ClangDefaultShortVersion = "11.0.1"

	// Directories with warnings from Android.bp files.
	WarningAllowedProjects = []string{
+6 −0
Original line number Diff line number Diff line
@@ -121,6 +121,12 @@ func (tidy *tidyFeature) flags(ctx ModuleContext, flags Flags) Flags {
	// many local projects enable cert-* checks, which
	// trigger bugprone-reserved-identifier.
	tidyChecks = tidyChecks + ",-bugprone-reserved-identifier*,-cert-dcl51-cpp,-cert-dcl37-c"
	// http://b/153757728
	tidyChecks = tidyChecks + ",-readability-qualified-auto"
	// http://b/155034563
	tidyChecks = tidyChecks + ",-bugprone-signed-char-misuse"
	// http://b/155034972
	tidyChecks = tidyChecks + ",-bugprone-branch-clone"
	flags.TidyFlags = append(flags.TidyFlags, tidyChecks)

	if len(tidy.Properties.Tidy_checks_as_errors) > 0 {