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

Commit e0f237eb authored by Joel Galenson's avatar Joel Galenson Committed by android-build-merger
Browse files

Merge "Pass --remap-path-prefix to Rust builds." 

am: bb03d69e

Change-Id: Iae2513e0c50a51f9fd2069506795225f94248da1
parents e91238c9 bb03d69e

rust/compiler.go

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags) Flag 
	flags.RustFlags = append(flags.RustFlags, compiler.featuresToFlags(compiler.Properties.Features)...)

	flags.RustFlags = append(flags.RustFlags, "--edition="+*compiler.Properties.Edition)

	flags.LinkFlags = append(flags.LinkFlags, compiler.Properties.Ld_flags...)

	flags.GlobalRustFlags = append(flags.GlobalRustFlags, config.GlobalRustFlags...)

	flags.GlobalRustFlags = append(flags.GlobalRustFlags, ctx.toolchain().ToolchainRustFlags())

	flags.GlobalLinkFlags = append(flags.GlobalLinkFlags, ctx.toolchain().ToolchainLinkFlags())

rust/config/global.go

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ var ( 


	DefaultDenyWarnings = proptools.BoolPtr(true)



	GlobalRustFlags = []string{

		"--remap-path-prefix $$(pwd)=",

	}



	deviceGlobalRustFlags = []string{}



	deviceGlobalLinkFlags = []string{