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

Commit 22686bab authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar Committed by Gerrit Code Review
Browse files

Revert "Update clang version to clang-r510928" 

Revert submission 2804373-clang_r510928

Bug: http://b/301328082

Reason for revert: Broke aosp-main/aosp_x86-next-userdebug

Reverted changes: /q/submissionid:2804373-clang_r510928

Change-Id: I6802b329e8dbd9dce5a75aab76c43960765a8594
parent 0790ce2e

cc/config/global.go

+2 −14
Original line number Diff line number Diff line
@@ -253,14 +253,6 @@ var ( 
		// http://b/161386391 for -Wno-pointer-to-int-cast

		"-Wno-pointer-to-int-cast",

		"-Werror=fortify-source",

		// http://b/315246135 temporarily disabled

		"-Wno-error=unused-variable",

		// http://b/315250603 temporarily disabled

		"-Wno-error=format",

		// Disabled because it produces many false positives. http://b/323050926

		"-Wno-missing-field-initializers",

		// http://b/323050889

		"-Wno-packed-non-pod",



		"-Werror=address-of-temporary",

		"-Werror=incompatible-function-pointer-types",
@@ -339,8 +331,6 @@ var ( 


		"-Wno-unused",

		"-Wno-deprecated",

		"-Wno-tautological-negation-compare",

		"-Wno-tautological-undefined-compare",

	}



	// Similar to noOverrideGlobalCflags, but applies only to third-party code
@@ -366,8 +356,6 @@ var ( 
		"-Wno-unqualified-std-cast-call",

		"-Wno-array-parameter",

		"-Wno-gnu-offsetof-extensions",

		// TODO: Enable this warning http://b/315245071

		"-Wno-fortify-source",

	}



	llvmNextExtraCommonGlobalCflags = []string{
@@ -387,8 +375,8 @@ var ( 


	// prebuilts/clang default settings.

	ClangDefaultBase         = "prebuilts/clang/host"

	ClangDefaultVersion      = "clang-r510928"

	ClangDefaultShortVersion = "18"

	ClangDefaultVersion      = "clang-r498229b"

	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-r510928"

	bindgenClangVersion = "clang-r498229b"



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

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