Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65c74d9f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "HostToolPath should return install path"

parents 84ce8d8d a756270e

rust/binary_test.go

+5 −0
Original line number Diff line number Diff line
@@ -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") {

rust/rust.go

+2 −2
Original line number Diff line number Diff line
@@ -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{}

}