diff options
| -rw-r--r-- | cc/cc.go | 7 | ||||
| -rw-r--r-- | cc/vndk_prebuilt.go | 4 |
2 files changed, 5 insertions, 6 deletions
@@ -1510,17 +1510,12 @@ func vendorMutator(mctx android.BottomUpMutatorContext) { mod := mctx.CreateVariations(vendorMode) vendor := mod[0].(*Module) vendor.Properties.UseVndk = true - } else if prebuilt, ok := m.linker.(*vndkPrebuiltLibraryDecorator); ok { + } else if _, ok := m.linker.(*vndkPrebuiltLibraryDecorator); ok { // Make vendor variants only for the versions in BOARD_VNDK_VERSION and // PRODUCT_EXTRA_VNDK_VERSIONS. mod := mctx.CreateVariations(vendorMode) vendor := mod[0].(*Module) vendor.Properties.UseVndk = true - arches := mctx.DeviceConfig().Arches() - if len(arches) == 0 || arches[0].ArchType.String() != prebuilt.arch() { - vendor.Properties.PreventInstall = true - vendor.Properties.HideFromMake = true - } } else if m.hasVendorVariant() && !vendorSpecific { // This will be available in both /system and /vendor // or a /system directory that is available to vendor. diff --git a/cc/vndk_prebuilt.go b/cc/vndk_prebuilt.go index 99e35f34..9c9545d8 100644 --- a/cc/vndk_prebuilt.go +++ b/cc/vndk_prebuilt.go @@ -110,6 +110,10 @@ func (p *vndkPrebuiltLibraryDecorator) link(ctx ModuleContext, } func (p *vndkPrebuiltLibraryDecorator) install(ctx ModuleContext, file android.Path) { + arches := ctx.DeviceConfig().Arches() + if len(arches) == 0 || arches[0].ArchType.String() != p.arch() { + return + } if p.shared() { if ctx.isVndkSp() { p.baseInstaller.subDir = "vndk-sp-" + p.version() |