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

Commit ed75f18e authored by Andrew Chant's avatar Andrew Chant Committed by Gerrit Code Review
Browse files

Merge "Revert "soong: upgrade Android platform to clang-r370808""

parents 455e3a08 862eb464

cc/config/clang.go

+0 −15
Original line number Diff line number Diff line
@@ -132,10 +132,6 @@ func init() { 
		// Disable -Winconsistent-missing-override until we can clean up the existing

		// codebase for it.

		"-Wno-inconsistent-missing-override",



		// Warnings from clang-10

		// Nested and array designated initialization is nice to have.

		"-Wno-c99-designator",

	}, " "))



	pctx.StaticVariable("ClangExtraCppflags", strings.Join([]string{
@@ -165,10 +161,6 @@ func init() { 
		// new warnings are fixed.

		"-Wno-tautological-constant-compare",

		"-Wno-tautological-type-limit-compare",

		// http://b/145210666

		"-Wno-reorder-init-list",

		// http://b/145211066

		"-Wno-implicit-int-float-conversion",

	}, " "))



	// Extra cflags for external third-party projects to disable warnings that
@@ -184,13 +176,6 @@ func init() { 
		// Bug: http://b/29823425 Disable -Wnull-dereference until the

		// new instances detected by this warning are fixed.

		"-Wno-null-dereference",



		// http://b/145211477

		"-Wno-pointer-compare",

		// http://b/145211022

		"-Wno-xor-used-as-pow",

		// http://b/145211022

		"-Wno-final-dtor-non-final-class",

	}, " "))

}

cc/config/global.go

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


	// prebuilts/clang default settings.

	ClangDefaultBase         = "prebuilts/clang/host"

	ClangDefaultVersion      = "clang-r370808"

	ClangDefaultShortVersion = "10.0.1"

	ClangDefaultVersion      = "clang-r365631b"

	ClangDefaultShortVersion = "9.0.7"



	// Directories with warnings from Android.bp files.

	WarningAllowedProjects = []string{

cc/ndk_library.go

+0 −1
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ func addStubLibraryCompilerFlags(flags Flags) Flags { 
		// We're knowingly doing some otherwise unsightly things with builtin

		// functions here. We're just generating stub libraries, so ignore it.

		"-Wno-incompatible-library-redeclaration",

		"-Wno-incomplete-setjmp-declaration",

		"-Wno-builtin-requires-header",

		"-Wno-invalid-noreturn",

		"-Wall",