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

Commit 5d7be45a authored by Ivan Lozano's avatar Ivan Lozano Committed by Gerrit Code Review
Browse files

Merge "Fix incorrect Rust installation paths."

parents 526291ab d6fdca89

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,