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

Commit cec8b2c0 authored by Yi Kong's avatar Yi Kong Committed by Gerrit Code Review
Browse files

Merge "Revert "Update clang version to clang-r487747""

parents 7861e65b 9ede2803

android/config.go

+0 −5
Original line number Diff line number Diff line
@@ -1359,11 +1359,6 @@ func (c *deviceConfig) NativeCoverageEnabledForPath(path string) bool { 
		}

	}

	if coverage && len(c.config.productVariables.NativeCoverageExcludePaths) > 0 {

		// Workaround coverage boot failure.

		// http://b/269981180

		if strings.HasPrefix(path, "external/protobuf") {

			coverage = false

		}

		if HasAnyPrefix(path, c.config.productVariables.NativeCoverageExcludePaths) {

			coverage = false

		}

cc/config/global.go

+2 −7
Original line number Diff line number Diff line
@@ -192,10 +192,6 @@ var ( 
	}



	noOverrideGlobalCflags = []string{

		// Workaround for boot loop caused by stack protector.

		// http://b/267839238

		"-mllvm -disable-check-noreturn-call",



		"-Werror=bool-operation",

		"-Werror=implicit-int-float-conversion",

		"-Werror=int-in-bool-context",
@@ -257,7 +253,6 @@ var ( 
		"-Wno-bitwise-instead-of-logical",

		"-Wno-misleading-indentation",

		"-Wno-array-parameter",

		"-Wno-gnu-offsetof-extensions",

	}



	// Extra cflags for external third-party projects to disable warnings that
@@ -310,8 +305,8 @@ var ( 


	// prebuilts/clang default settings.

	ClangDefaultBase         = "prebuilts/clang/host"

	ClangDefaultVersion      = "clang-r487747"

	ClangDefaultShortVersion = "17"

	ClangDefaultVersion      = "clang-r475365b"

	ClangDefaultShortVersion = "16.0.2"



	// Directories with warnings from Android.bp files.

	WarningAllowedProjects = []string{