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

Commit 7693c2fa authored by Xin Li's avatar Xin Li
Browse files

Merge stage-dr1-aosp-master into stage-aosp-master

Bug: 112535855
Change-Id: I04a01f2c14925da24b60caa282f037be8133a562
parents 09fac0c3 70c79739
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -173,16 +173,19 @@ func init() {
		// this new warning are fixed.
		"-Wno-null-pointer-arithmetic",

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

		// Disable c++98-specific warning since Android is not concerned with C++98
		// compatibility.
		"-Wno-c++98-compat-extra-semi",
	}, " "))

	// Extra cflags for projects under external/ directory to disable warnings that are infeasible
	// to fix in all the external projects and their upstream repos.
	// Extra cflags for projects under external/ directory
	pctx.StaticVariable("ClangExtraExternalCflags", strings.Join([]string{
		"-Wno-enum-compare",
		"-Wno-enum-compare-switch",
		// TODO(yikong): Move -Wno flags here
	}, " "))
}