summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yu Liu <yudiliu@google.com> 2025-03-20 15:42:25 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-03-20 15:42:25 -0700
commit7b86f8ff49481f9c2ae4fc40b0890f82c769dd69 (patch)
treedc0276b6d1864659f1c9aa4d8c0d738c864aac4b
parent89d23d3ef9831f908c08cc2afcb0c26353420385 (diff)
parent6ef0d742df8fac26be3d4396b60c4332cf371b44 (diff)
Merge "Use provider to get outpath in getRequiredMemberOutputFile." into main
-rw-r--r--cc/library_sdk_member.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/library_sdk_member.go b/cc/library_sdk_member.go
index d1440eaad..46290300c 100644
--- a/cc/library_sdk_member.go
+++ b/cc/library_sdk_member.go
@@ -573,9 +573,8 @@ func (p *nativeLibInfoProperties) PopulateFromVariant(ctx android.SdkMemberConte
func getRequiredMemberOutputFile(ctx android.SdkMemberContext, ccModule *Module) android.Path {
var path android.Path
- outputFile := ccModule.OutputFile()
- if outputFile.Valid() {
- path = outputFile.Path()
+ if info, ok := android.OtherModuleProvider(ctx.SdkModuleContext(), ccModule, LinkableInfoProvider); ok && info.OutputFile.Valid() {
+ path = info.OutputFile.Path()
} else {
ctx.SdkModuleContext().ModuleErrorf("member variant %s does not have a valid output file", ccModule)
}