Pass --remap-path-prefix to Rust builds.
We need to pass --remap-path-prefix to Rust builds to ensure that they
are reproducible across different paths. This adds that for both host
and device builds.
Test: Verify host and device builds are reproducible with different
directories.
Change-Id: I68ba31537b2332fd05613aa0fb00a1502d78e410
diff --git a/rust/compiler.go b/rust/compiler.go
index 6c603df..3bfef76 100644
--- a/rust/compiler.go
+++ b/rust/compiler.go
@@ -120,6 +120,7 @@
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())
diff --git a/rust/config/global.go b/rust/config/global.go
index c66c3c1..ae50804 100644
--- a/rust/config/global.go
+++ b/rust/config/global.go
@@ -37,6 +37,10 @@
DefaultDenyWarnings = proptools.BoolPtr(true)
+ GlobalRustFlags = []string{
+ "--remap-path-prefix $$(pwd)=",
+ }
+
deviceGlobalRustFlags = []string{}
deviceGlobalLinkFlags = []string{