tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use prebuilt llvm-rs-cc for unbundled build

Browse source 
Matches the make logic.

Bug: 117295826
Test: tapas com.android.media && m
Change-Id: Ie97220af9c72540d5f5cfd5f9f9e04f5edfea781
This commit is contained in:
Colin Cross 2018-11-18 20:57:21 -08:00
parent 6028c3bdf4
commit 2548b447f6
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cc/rs.go
View file

@ -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(`