commit 724286c957fda511613d3d8020b792581518291b
author Joel Galenson <jgalenson@google.com> Mon Sep 30 13:01:37 2019 -0700
committer Joel Galenson <jgalenson@google.com> Tue Oct 01 11:12:15 2019 -0700
tree b60223cc6bf97ee7bce02be3cc3f39cf15901231
parent 852116a061d8a339d0bca72744941537bcdba7ca

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

rust/compiler.go

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())