From 756ec8d8f101a20c69073d1986cdc2fe286feaf6 Mon Sep 17 00:00:00 2001 From: Kris Alder Date: Fri, 27 Aug 2021 22:08:29 +0000 Subject: [PATCH] include vendor linked-libraries in fuzz target bundles Without this, any libraries with vendor: true set won't be included. Bug: 197917632 Test: make haiku, run several fuzz targets on a device Change-Id: Icab8d3f17d1f07f49940ee0ea52d9312a925affa --- cc/fuzz.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cc/fuzz.go b/cc/fuzz.go index fbef12b5f..83f003741 100644 --- a/cc/fuzz.go +++ b/cc/fuzz.go @@ -123,7 +123,7 @@ func collectAllSharedDependencies(ctx android.SingletonContext, module android.M // that should be installed in the fuzz target output directories. This function // returns true, unless: // - The module is not an installable shared library, or -// - The module is a header, stub, or vendor-linked library, or +// - The module is a header or stub, or // - The module is a prebuilt and its source is available, or // - The module is a versioned member of an SDK snapshot. func isValidSharedDependency(dependency android.Module) bool { @@ -141,11 +141,6 @@ func isValidSharedDependency(dependency android.Module) bool { return false } - if linkable.UseVndk() { - // Discard vendor linked libraries. - return false - } - if lib := moduleLibraryInterface(dependency); lib != nil && lib.buildStubs() && linkable.CcLibrary() { // Discard stubs libs (only CCLibrary variants). Prebuilt libraries should not // be excluded on the basis of they're not CCLibrary()'s.