Merge "LLNDK libraries can also provide libraries" into main

This commit is contained in:
Treehugger Robot
2024-07-09 00:51:45 +00:00
committed by Gerrit Code Review

View File

@@ -104,7 +104,7 @@ func BuildLinkerConfig(ctx android.ModuleContext, builder *android.RuleBuilder,
// Secondly, if there's provideLibs gathered from provideModules, append them // Secondly, if there's provideLibs gathered from provideModules, append them
var provideLibs []string var provideLibs []string
for _, m := range provideModules { for _, m := range provideModules {
if c, ok := m.(*cc.Module); ok && cc.IsStubTarget(c) { if c, ok := m.(*cc.Module); ok && (cc.IsStubTarget(c) || c.HasLlndkStubs()) {
for _, ps := range c.PackagingSpecs() { for _, ps := range c.PackagingSpecs() {
provideLibs = append(provideLibs, ps.FileName()) provideLibs = append(provideLibs, ps.FileName())
} }