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

Commit 3eda019e authored by Sam Delmerico's avatar Sam Delmerico Committed by Gerrit Code Review
Browse files

Revert "Respect Clang version override env vars." 

Revert submission 2478283-master-I3cf18e7814ff52d526017e4fe34b17ab3d8f1080

Reason for revert: implementing a different way

Reverted changes: /q/submissionid:2478283-master-I3cf18e7814ff52d526017e4fe34b17ab3d8f1080

Change-Id: I1d690b6d322adc664e4c02d958f0183bbb78e669
parent ebc290c7

android/config_bp2build.go

+0 −9
Original line number Diff line number Diff line
@@ -95,15 +95,6 @@ func (ev ExportedVariables) ExportVariableConfigMethod(name string, method inter 
	return ev.pctx.VariableConfigMethod(name, method)

}



func (ev ExportedVariables) ExportStringStaticVariableWithEnvOverride(name, envVar, defaultVal string) {

	ev.ExportVariableConfigMethod(name, func(config Config) string {

		if override := config.Getenv(envVar); override != "" {

			return override

		}

		return defaultVal

	})

}



// ExportSourcePathVariable declares a static "source path" variable and exports

// it to Bazel's toolchain.

func (ev ExportedVariables) ExportSourcePathVariable(name string, value string) {

cc/config/global.go

+5 −2
Original line number Diff line number Diff line
@@ -417,12 +417,15 @@ func init() { 
	exportedVars.ExportStringList("CommonGlobalIncludes", commonGlobalIncludes)

	pctx.PrefixedExistentPathsForSourcesVariable("CommonGlobalIncludes", "-I", commonGlobalIncludes)



	exportedVars.ExportStringStaticVariable("CLANG_DEFAULT_VERSION", ClangDefaultVersion)

	exportedVars.ExportStringStaticVariable("CLANG_DEFAULT_SHORT_VERSION", ClangDefaultShortVersion)



	pctx.StaticVariableWithEnvOverride("ClangBase", "LLVM_PREBUILTS_BASE", ClangDefaultBase)

	exportedVars.ExportStringStaticVariableWithEnvOverride("ClangVersion", "LLVM_PREBUILTS_VERSION", ClangDefaultVersion)

	pctx.StaticVariableWithEnvOverride("ClangVersion", "LLVM_PREBUILTS_VERSION", ClangDefaultVersion)

	pctx.StaticVariable("ClangPath", "${ClangBase}/${HostPrebuiltTag}/${ClangVersion}")

	pctx.StaticVariable("ClangBin", "${ClangPath}/bin")



	exportedVars.ExportStringStaticVariableWithEnvOverride("ClangShortVersion", "LLVM_RELEASE_VERSION", ClangDefaultShortVersion)

	pctx.StaticVariableWithEnvOverride("ClangShortVersion", "LLVM_RELEASE_VERSION", ClangDefaultShortVersion)

	pctx.StaticVariable("ClangAsanLibDir", "${ClangBase}/linux-x86/${ClangVersion}/lib/clang/${ClangShortVersion}/lib/linux")



	// These are tied to the version of LLVM directly in external/llvm, so they might trail the host prebuilts