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

Commit 4f49e359 authored by Nick Desaulniers's avatar Nick Desaulniers
Browse files

soong: upgrade Android platform to clang-r370808 



-Wc99-designators warns for the use of nested and array initializers in
C++20 code. Many internal projects have pushed back against this
warning.

Disables:
- -Wimplicit-int-float-conversion
- -Wpointer-compare
- -Wxor-used-as-pow
- -Wfinal-dtor-non-final-class
- -Wreorder-init-list

For projects under external/, vendor/, etc, but only if they use
Android.bp (not Android.mk) and -Wreorder-init-list may be re-enabled by
-Wall if set locally.

-Wno-incomplete-setjmp-declaration is needed for NDK stubs that get
generated (functions without full definitions of their parameters).

Sets
- -Wno-error=implicit-int-float-conversion
- -Wno-error=reorder-init-list
for all projects in order to unblock landing the compiler upgrade due to
internal projects not being able to disable or fix these before the
upgrade.

Bug: 139945549
Test: build (aosp_crosshatch, crosshatch, aosp_x86_64-eng,
  walleye), boot internal devices, bionic + RS atests, kernel builds.
Signed-off-by: default avatarNick Desaulniers <ndesaulniers@google.com>

Change-Id: I18e3c0eb657fd59824526f36c6dd57bdcf0526ba
parent 62835fd8

cc/config/clang.go

+15 −0
Original line number Diff line number Diff line
@@ -132,6 +132,10 @@ 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{
@@ -161,6 +165,10 @@ 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
@@ -176,6 +184,13 @@ 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
@@ -124,8 +124,8 @@ var ( 


	// prebuilts/clang default settings.

	ClangDefaultBase         = "prebuilts/clang/host"

	ClangDefaultVersion      = "clang-r365631b"

	ClangDefaultShortVersion = "9.0.7"

	ClangDefaultVersion      = "clang-r370808"

	ClangDefaultShortVersion = "10.0.1"



	// Directories with warnings from Android.bp files.

	WarningAllowedProjects = []string{

cc/ndk_library.go

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ 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",