From bdda910395f9f560cd456c3b7a8db4a90946f480 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Thu, 16 Dec 2021 23:42:47 +0000 Subject: [PATCH] rust: Disable dylib vendor modules These modules do not currently build correctly. Support is planned but not complete. Bug: 204303985 Test: Presubmit + build `rust_library` with `vendor_available: true` Change-Id: Iac7df9fe0d4eaa9a5ec0ff5a9cd5670af23df2a6 --- rust/library.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rust/library.go b/rust/library.go index 07843fe32..bb2e83fdb 100644 --- a/rust/library.go +++ b/rust/library.go @@ -681,6 +681,12 @@ func LibraryMutator(mctx android.BottomUpMutatorContext) { } 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) && m.HasVendorVariant() && !snapshot.IsVendorProprietaryModule(mctx) &&