Fixes for gtests in eng-prod
Bug: 147817558
Test: art/art-host-gtest on forrest
Change-Id: I0ecfbc81fe6998d4c8c69ce6fbeb35bdd5908b55
diff --git a/build/makevars.go b/build/makevars.go
index 3b9d0a6..1965b5d 100644
--- a/build/makevars.go
+++ b/build/makevars.go
@@ -20,6 +20,7 @@
"strings"
"android/soong/android"
+ "android/soong/cc/config"
)
var (
@@ -67,10 +68,7 @@
ctx.Strict("ART_TESTCASES_CONTENT", strings.Join(copy_cmds, " "))
// Add prebuilt tools.
- clang_path, err := ctx.Eval("${config.ClangPath}")
- if err != nil {
- panic(err)
- }
+ clang_path := filepath.Join(config.ClangDefaultBase, ctx.Config().PrebuiltOS(), config.ClangDefaultVersion)
copy_cmds = []string{}
for _, tool := range prebuiltToolsForTests {
src := filepath.Join(clang_path, "/", tool)