Merge "Add a property to rust_ffi targets to exclude them from APEXes." into main

1 files changed, 13 insertions, 0 deletions

diff --git a/rust/rust.go b/rust/rust.go
index 3402adcc5..5a973c4e7 100644
--- a/rust/rust.go
+++ b/rust/rust.go
@@ -294,6 +294,15 @@ func (mod *Module) StaticExecutable() bool {
 	return mod.StaticallyLinked()
 }
 
+func (mod *Module) ApexExclude() bool {
+	if mod.compiler != nil {
+		if library, ok := mod.compiler.(libraryInterface); ok {
+			return library.apexExclude()
+		}
+	}
+	return false
+}
+
 func (mod *Module) Object() bool {
 	// Rust has no modules which produce only object files.
 	return false
@@ -1863,6 +1872,10 @@ func (mod *Module) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Mo
 		return false
 	}
 
+	if rustDep, ok := dep.(*Module); ok && rustDep.ApexExclude() {
+		return false
+	}
+
 	return true
 }