diff options
Diffstat (limited to 'rust')
| -rw-r--r-- | rust/config/arm_device.go | 1 | ||||
| -rw-r--r-- | rust/config/x86_64_device.go | 2 | ||||
| -rw-r--r-- | rust/config/x86_device.go | 1 | ||||
| -rw-r--r-- | rust/sanitize.go | 5 |
4 files changed, 8 insertions, 1 deletions
diff --git a/rust/config/arm_device.go b/rust/config/arm_device.go index 42c1c0256..a5f4afb92 100644 --- a/rust/config/arm_device.go +++ b/rust/config/arm_device.go @@ -44,6 +44,7 @@ func init() { strings.Join(rustFlags, " ")) } + ExportedVars.ExportStringListStaticVariable("DEVICE_ARM_RUSTC_FLAGS", ArmRustFlags) } type toolchainArm struct { diff --git a/rust/config/x86_64_device.go b/rust/config/x86_64_device.go index 45d1fd0a1..c797eefe3 100644 --- a/rust/config/x86_64_device.go +++ b/rust/config/x86_64_device.go @@ -53,7 +53,7 @@ func init() { pctx.StaticVariable("X86_64"+variant+"VariantRustFlags", strings.Join(rustFlags, " ")) } - + ExportedVars.ExportStringListStaticVariable("DEVICE_X86_64_RUSTC_FLAGS", x86_64RustFlags) } type toolchainX86_64 struct { diff --git a/rust/config/x86_device.go b/rust/config/x86_device.go index 43f73400e..822f281a8 100644 --- a/rust/config/x86_device.go +++ b/rust/config/x86_device.go @@ -55,6 +55,7 @@ func init() { strings.Join(rustFlags, " ")) } + ExportedVars.ExportStringListStaticVariable("DEVICE_X86_RUSTC_FLAGS", x86RustFlags) } type toolchainX86 struct { diff --git a/rust/sanitize.go b/rust/sanitize.go index 2f5afd74d..0b1043597 100644 --- a/rust/sanitize.go +++ b/rust/sanitize.go @@ -203,6 +203,11 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { s.Address = nil } + // TODO: Remove once b/304507701 is resolved + if Bool(s.Address) && ctx.Host() { + s.Address = nil + } + // Memtag_heap is only implemented on AArch64. if ctx.Arch().ArchType != android.Arm64 || !ctx.Os().Bionic() { s.Memtag_heap = nil |