diff options
| author | 2025-03-20 16:07:10 -0700 | |
|---|---|---|
| committer | 2025-03-20 16:07:10 -0700 | |
| commit | 2ff86db049b2ddebb5eb028eb55d7e09952b8172 (patch) | |
| tree | b98767e891613f271bed4fd5b3042f8f40ee5324 | |
| parent | d0ac17c7841225203bdb335341265fae9adc94d6 (diff) | |
| parent | 7b86f8ff49481f9c2ae4fc40b0890f82c769dd69 (diff) | |
Merge "Use provider to get outpath in getRequiredMemberOutputFile." into main am: 7b86f8ff49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3555023
Change-Id: Iaf1dcc5cf62fd052df18c484a1b35018ed8b8e02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cc/library_sdk_member.go | 5 |
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) } |