From a756270ec2f819c91b4cb47dbbcf8f6690dfe382 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Mon, 10 Aug 2020 21:50:43 -0700 Subject: [PATCH] HostToolPath should return install path Bug: 163154468 Test: make; find dependencies of 'Module: sqlite3_bindgen_x86_64' Change-Id: Id9fc4f1937983bdf7eb1732ed6a8afd5aa3eb24c --- rust/binary_test.go | 5 +++++ rust/rust.go | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rust/binary_test.go b/rust/binary_test.go index ab2dae153..b9c8698b9 100644 --- a/rust/binary_test.go +++ b/rust/binary_test.go @@ -36,6 +36,11 @@ func TestPreferDynamicBinary(t *testing.T) { fizzBuzz := ctx.ModuleForTests("fizz-buzz", "linux_glibc_x86_64").Output("fizz-buzz") fizzBuzzDynamic := ctx.ModuleForTests("fizz-buzz-dynamic", "linux_glibc_x86_64").Output("fizz-buzz-dynamic") + path := ctx.ModuleForTests("fizz-buzz", "linux_glibc_x86_64").Module().(*Module).HostToolPath() + if g, w := path.String(), "/host/linux-x86/bin/fizz-buzz"; !strings.Contains(g, w) { + t.Errorf("wrong host tool path, expected %q got %q", w, g) + } + // Do not compile binary modules with the --test flag. flags := fizzBuzzDynamic.Args["rustcFlags"] if strings.Contains(flags, "--test") { diff --git a/rust/rust.go b/rust/rust.go index edfa5d89e..46159c617 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -1057,8 +1057,8 @@ func (mod *Module) HostToolPath() android.OptionalPath { if !mod.Host() { return android.OptionalPath{} } - if _, ok := mod.compiler.(*binaryDecorator); ok { - return mod.outputFile + if binary, ok := mod.compiler.(*binaryDecorator); ok { + return android.OptionalPathForPath(binary.baseCompiler.path) } return android.OptionalPath{} }