Use prebuilt llvm-rs-cc for unbundled build
Matches the make logic. Bug: 117295826 Test: tapas com.android.media && m Change-Id: Ie97220af9c72540d5f5cfd5f9f9e04f5edfea781
This commit is contained in:
11
cc/rs.go
11
cc/rs.go
@@ -16,13 +16,22 @@ package cc
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"android/soong/android"
|
"android/soong/android"
|
||||||
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/google/blueprint"
|
"github.com/google/blueprint"
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
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(`
|
var rsCppCmdLine = strings.Replace(`
|
||||||
|
Reference in New Issue
Block a user