diff options
| author | Jayant Chowdhary <jchowdhary@google.com> | 2017-02-01 19:19:52 -0800 |
|---|---|---|
| committer | Jayant Chowdhary <jchowdhary@google.com> | 2017-02-07 12:15:45 -0800 |
| commit | e622d20659bbc9566e2d2f68bededc112144d6bc (patch) | |
| tree | feaf18c51a86c347efbde7dc2153320d617fc5af /cc | |
| parent | d9f6fa28d681de1051adcddb5aef293e02bcc60e (diff) | |
| download | build_soong-e622d20659bbc9566e2d2f68bededc112144d6bc.tar.gz build_soong-e622d20659bbc9566e2d2f68bededc112144d6bc.tar.bz2 build_soong-e622d20659bbc9566e2d2f68bededc112144d6bc.zip | |
Add RenderScript toolchain information to soong.
Test: make -j64 from top of tree.
Change-Id: I9e853e64924f26719c0cd7ae8de4958fe97ca04e
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/config/global.go | 8 | ||||
| -rw-r--r-- | cc/makevars.go | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/cc/config/global.go b/cc/config/global.go index e254a1c8..1ce1cce5 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -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 diff --git a/cc/makevars.go b/cc/makevars.go index 30d83e8e..06b57c94 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -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", "") |