Support Rust in native-bridge
Bug: 178565008
Bug: 165791368
Test: Build and link a Rust library into a native-bridge binary
Change-Id: I3546571530529203d9dbfd62777f20de18c6bd51
diff --git a/rust/rust.go b/rust/rust.go
index 24c8634..70721fb 100644
--- a/rust/rust.go
+++ b/rust/rust.go
@@ -766,6 +766,10 @@
}
func (mod *Module) nativeCoverage() bool {
+ // Bug: http://b/137883967 - native-bridge modules do not currently work with coverage
+ if mod.Target().NativeBridge == android.NativeBridgeEnabled {
+ return false
+ }
return mod.compiler != nil && mod.compiler.nativeCoverage()
}
@@ -819,6 +823,10 @@
mod.Properties.SubName += cc.RecoverySuffix
}
+ if mod.Target().NativeBridge == android.NativeBridgeEnabled {
+ mod.Properties.SubName += cc.NativeBridgeSuffix
+ }
+
if !toolchain.Supported() {
// This toolchain's unsupported, there's nothing to do for this mod.
return