StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "rust: Disable dylib vendor modules"

Browse Source
This commit is contained in:
Matthew Maurer
2021-12-20 21:40:56 +00:00
committed by Gerrit Code Review
parent 880e11112d bdda910395
commit 2e2ec0573f
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rust/library.go
View File

@@ -681,6 +681,12 @@ func LibraryMutator(mctx android.BottomUpMutatorContext) {
} }
variation := v.(*Module).ModuleBase.ImageVariation().Variation variation := v.(*Module).ModuleBase.ImageVariation().Variation
if strings.HasPrefix(variation, cc.VendorVariationPrefix) {
// TODO(b/204303985)
// Disable vendor dylibs until they are supported
v.(*Module).Disable()
}
if strings.HasPrefix(variation, cc.VendorVariationPrefix) && if strings.HasPrefix(variation, cc.VendorVariationPrefix) &&
m.HasVendorVariant() && m.HasVendorVariant() &&
!snapshot.IsVendorProprietaryModule(mctx) && !snapshot.IsVendorProprietaryModule(mctx) &&