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

Commit fd07ed2c authored by Yi Kong's avatar Yi Kong
Browse files

Revert^2 "Update clang version to clang-r487747" 

9ede2803

Bug: 264965700
Change-Id: I4154c70c050a825525d5b591fa757104eb78c158
parent cd7db257

android/config.go

+5 −0
Original line number Diff line number Diff line
@@ -1369,6 +1369,11 @@ 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

+3 −2
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ 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
@@ -304,8 +305,8 @@ var ( 


	// prebuilts/clang default settings.

	ClangDefaultBase         = "prebuilts/clang/host"

	ClangDefaultVersion      = "clang-r475365b"

	ClangDefaultShortVersion = "16.0.2"

	ClangDefaultVersion      = "clang-r487747"

	ClangDefaultShortVersion = "17"



	// Directories with warnings from Android.bp files.

	WarningAllowedProjects = []string{

rust/bindgen.go

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ var ( 
	defaultBindgenFlags = []string{""}



	// bindgen should specify its own Clang revision so updating Clang isn't potentially blocked on bindgen failures.

	bindgenClangVersion = "clang-r475365b"

	bindgenClangVersion = "clang-r487747"



	_ = pctx.VariableFunc("bindgenClangVersion", func(ctx android.PackageVarContext) string {

		if override := ctx.Config().Getenv("LLVM_BINDGEN_PREBUILTS_VERSION"); override != "" {