diff options
| author | Colin Cross <ccross@android.com> | 2018-11-18 20:57:21 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-11-18 20:58:10 -0800 |
| commit | 2548b447f67ed7f3e492012ca14c9ab312887ce0 (patch) | |
| tree | 2edd0881d8ba85b3f8c6b16e1e21b0d49d0d02c1 /cc/rs.go | |
| parent | 6028c3bdf4ee2aaa547fa134a52305597d6a807b (diff) | |
| download | android_build_soong-2548b447f67ed7f3e492012ca14c9ab312887ce0.tar.gz android_build_soong-2548b447f67ed7f3e492012ca14c9ab312887ce0.tar.bz2 android_build_soong-2548b447f67ed7f3e492012ca14c9ab312887ce0.zip | |
Use prebuilt llvm-rs-cc for unbundled build
Matches the make logic.
Bug: 117295826
Test: tapas com.android.media && m
Change-Id: Ie97220af9c72540d5f5cfd5f9f9e04f5edfea781
Diffstat (limited to 'cc/rs.go')
| -rw-r--r-- | cc/rs.go | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -16,13 +16,22 @@ package cc import ( "android/soong/android" + "path/filepath" + "runtime" "strings" "github.com/google/blueprint" ) func init() { - pctx.HostBinToolVariable("rsCmd", "llvm-rs-cc") + pctx.VariableFunc("rsCmd", func(ctx android.PackageVarContext) string { + if ctx.Config().UnbundledBuild() { + // Use RenderScript prebuilts for unbundled builds but not PDK builds + return filepath.Join("prebuilts/sdk/tools", runtime.GOOS, "bin/llvm-rs-cc") + } else { + return pctx.HostBinToolPath(ctx, "llvm-rs-cc").String() + } + }) } var rsCppCmdLine = strings.Replace(` |