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

Commit f25ab75d authored by Joel Galenson's avatar Joel Galenson Committed by Gerrit Code Review
Browse files

Merge "rust: Fix Host multilib prop for rust_test modules."

parents b29852a3 f5c98a2f
Loading
Loading
Loading
Loading
+19 −0
Original line number Diff line number Diff line
@@ -210,6 +210,12 @@ func init() {

func RustTestFactory() android.Module {
	module, _ := NewRustTest(android.HostAndDeviceSupported)

	// NewRustTest will set MultilibBoth true, however the host variant
	// cannot produce the non-primary target. Therefore, add the
	// rustTestHostMultilib load hook to set MultilibFirst for the
	// host target.
	android.AddLoadHook(module, rustTestHostMultilib)
	return module.Init()
}

@@ -236,3 +242,16 @@ func (test *testDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps {
func (test *testDecorator) testBinary() bool {
	return true
}

func rustTestHostMultilib(ctx android.LoadHookContext) {
	type props struct {
		Target struct {
			Host struct {
				Compile_multilib *string
			}
		}
	}
	p := &props{}
	p.Target.Host.Compile_multilib = proptools.StringPtr("first")
	ctx.AppendProperties(p)
}