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

Commit d6fdca89 authored by Ivan Lozano's avatar Ivan Lozano
Browse files

Fix incorrect Rust installation paths. 

Rust binaries were installing to the wrong paths. This fixes
the install path by only including the archtype subdir when there's a
multilib conflict for that archtype.

Bug: 153423714
Test: Example rust module installs to expected path.
Change-Id: I63ea1ce7dae0d97d65522e0917d916b44808f442
parent 1c5d4fe4

rust/compiler.go

+4 −1
Original line number Diff line number Diff line
@@ -222,7 +222,10 @@ func (compiler *baseCompiler) installDir(ctx ModuleContext) android.InstallPath 
	if ctx.toolchain().Is64Bit() && compiler.dir64 != "" {

		dir = compiler.dir64

	}

	if !ctx.Host() || ctx.Target().NativeBridge == android.NativeBridgeEnabled {

	if ctx.Target().NativeBridge == android.NativeBridgeEnabled {

		dir = filepath.Join(dir, ctx.Target().NativeBridgeRelativePath)

	}

	if !ctx.Host() && ctx.Config().HasMultilibConflict(ctx.Arch().ArchType) {

		dir = filepath.Join(dir, ctx.Arch().ArchType.String())

	}

	return android.PathForModuleInstall(ctx, dir, compiler.subDir,