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

Commit acaef412 authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

Merge "Revert "Revert "Revert "Move -Wno-enum-compare{,-switch} to external... 

Merge "Revert "Revert "Revert "Move -Wno-enum-compare{,-switch} to external cflags"""" am: 4de27d7e am: 2de6cdce
am: 4c0986ca

Change-Id: Ib0d3748db440265c648448b5df96ba4ee37d7779
parents 1684264e 4c0986ca

cc/config/clang.go

+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

	}, " "))

}