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

Commit b6b386bf authored by Stephen Hines's avatar Stephen Hines Committed by android-build-merger
Browse files

Merge "Switch to clang-4579689." am: fa54e751

am: 3bcedd91

Change-Id: I957e4f11b965a97702d54ab3cdf71a11d1f3c25b
parents a6c23613 3bcedd91
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -148,6 +148,19 @@ func init() {
		// fixed.
		//"-Werror=null-dereference",
		"-Werror=return-type",

		// http://b/72331526 Disable -Wtautological-* until the instances detected by these
		// new warnings are fixed.
		"-Wno-error=tautological-constant-compare",

		// http://b/72331524 Allow null pointer arithmetic until the instances detected by
		// this new warning are fixed.
		"-Wno-error=null-pointer-arithmetic",

		// http://b/72330874 Disable -Wenum-compare until the instances detected by this new
		// warning are fixed.
		"-Wno-error=enum-compare",
		"-Wno-error=enum-compare-switch",
	}, " "))
}

+2 −2
Original line number Diff line number Diff line
@@ -116,8 +116,8 @@ var (

	// prebuilts/clang default settings.
	ClangDefaultBase         = "prebuilts/clang/host"
	ClangDefaultVersion      = "clang-4393122"
	ClangDefaultShortVersion = "5.0.1"
	ClangDefaultVersion      = "clang-4579689"
	ClangDefaultShortVersion = "6.0.1"

	// Directories with warnings from Android.bp files.
	WarningAllowedProjects = []string{