Add a property to rust_ffi targets to exclude them from APEXes.
This is a temporary measure until stubs are properly supported by rust_ffi targets. Bug: 361441210 Bug: 362509506 Change-Id: Ieabd4e3abf442de660f39ec6c5776f5832b25e14 Test: manual
This commit is contained in:
@@ -2230,6 +2230,10 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext,
|
||||
addAconfigFiles(vctx, ctx, child)
|
||||
return true // track transitive dependencies
|
||||
} else if rm, ok := child.(*rust.Module); ok {
|
||||
if !android.IsDepInSameApex(ctx, am, am) {
|
||||
return false
|
||||
}
|
||||
|
||||
af := apexFileForRustLibrary(ctx, rm)
|
||||
af.transitiveDep = true
|
||||
vctx.filesInfo = append(vctx.filesInfo, af)
|
||||
@@ -2249,6 +2253,10 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext,
|
||||
}
|
||||
} else if rust.IsDylibDepTag(depTag) {
|
||||
if rustm, ok := child.(*rust.Module); ok && rustm.IsInstallableToApex() {
|
||||
if !android.IsDepInSameApex(ctx, am, am) {
|
||||
return false
|
||||
}
|
||||
|
||||
af := apexFileForRustLibrary(ctx, rustm)
|
||||
af.transitiveDep = true
|
||||
vctx.filesInfo = append(vctx.filesInfo, af)
|
||||
|
Reference in New Issue
Block a user