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

Commit 89a0d797 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Gerrit Code Review
Browse files

Merge "Add RenderScript toolchain information to soong."

parents 1d83bc78 e622d206

cc/config/global.go

+8 −0
Original line number Diff line number Diff line
@@ -145,6 +145,14 @@ func init() { 
	})

	pctx.StaticVariable("ClangAsanLibDir", "${ClangPath}/lib64/clang/${ClangShortVersion}/lib/linux")



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

	// being used for the rest of the build process.

	pctx.SourcePathVariable("RSClangBase", "prebuilts/clang/host")

	pctx.SourcePathVariable("RSClangVersion", "clang-3289846")

	pctx.SourcePathVariable("RSReleaseVersion", "3.8")

	pctx.StaticVariable("RSLLVMPrebuiltsPath", "${RSClangBase}/${HostPrebuiltTag}/${RSClangVersion}/bin")

	pctx.StaticVariable("RSIncludePath", "${RSLLVMPrebuiltsPath}/../lib64/clang/${RSReleaseVersion}/include")



	pctx.VariableFunc("CcWrapper", func(config interface{}) (string, error) {

		if override := config.(android.Config).Getenv("CC_WRAPPER"); override != "" {

			return override + " ", nil

cc/makevars.go

+7 −0
Original line number Diff line number Diff line
@@ -40,6 +40,13 @@ func makeVarsProvider(ctx android.MakeVarsContext) { 
	ctx.Strict("PATH_TO_CLANG_TIDY", "${config.ClangBin}/clang-tidy")

	ctx.StrictSorted("CLANG_CONFIG_UNKNOWN_CFLAGS", strings.Join(config.ClangUnknownCflags, " "))



	ctx.Strict("RS_LLVM_PREBUILTS_VERSION", "${config.RSClangVersion}")

	ctx.Strict("RS_LLVM_PREBUILTS_BASE", "${config.RSClangBase}")

	ctx.Strict("RS_LLVM_PREBUILTS_PATH", "${config.RSLLVMPrebuiltsPath}")

	ctx.Strict("RS_CLANG", "${config.RSLLVMPrebuiltsPath}/clang")

	ctx.Strict("RS_LLVM_AS", "${config.RSLLVMPrebuiltsPath}/llvm-as")

	ctx.Strict("RS_LLVM_LINK", "${config.RSLLVMPrebuiltsPath}/llvm-link")



	ctx.Strict("GLOBAL_CFLAGS_NO_OVERRIDE", "${config.NoOverrideGlobalCflags}")

	ctx.Strict("GLOBAL_CLANG_CFLAGS_NO_OVERRIDE", "${config.ClangExtraNoOverrideCflags}")

	ctx.Strict("GLOBAL_CPPFLAGS_NO_OVERRIDE", "")