diff --git a/cc/fuzz.go b/cc/fuzz.go index d7da5abea..9fe5b17f5 100644 --- a/cc/fuzz.go +++ b/cc/fuzz.go @@ -20,6 +20,8 @@ import ( "sort" "strings" + "github.com/google/blueprint/proptools" + "android/soong/android" "android/soong/cc/config" ) @@ -172,7 +174,7 @@ func collectAllSharedDependencies(ctx android.SingletonContext, module android.M // This function takes a module and determines if it is a unique shared library // that should be installed in the fuzz target output directories. This function // returns true, unless: -// - The module is not a shared library, or +// - The module is not an installable shared library, or // - The module is a header, stub, or vendor-linked library, or // - The module is a prebuilt and its source is available, or // - The module is a versioned member of an SDK snapshot. @@ -209,6 +211,11 @@ func isValidSharedDependency(dependency android.Module) bool { if _, isLLndkStubLibrary := ccLibrary.linker.(*stubDecorator); isLLndkStubLibrary { return false } + // Discard installable:false libraries because they are expected to be absent + // in runtime. + if !proptools.BoolDefault(ccLibrary.Properties.Installable, true) { + return false + } } // If the same library is present both as source and a prebuilt we must pick