Merge "include vendor linked-libraries in fuzz target bundles"
This commit is contained in:
commit
c2ac3ee294
1 changed files with 1 additions and 6 deletions
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue