diff options
| author | 2024-09-18 23:00:53 +0000 | |
|---|---|---|
| committer | 2024-09-18 23:00:53 +0000 | |
| commit | a7050c9834c9f3f728958e3392e13ebc6bba227b (patch) | |
| tree | 5f3f8a2b4c32d978e0d8770705210118125d4343 /java/java.go | |
| parent | 7b3a472e140d711d227bf5e8f9642ae209587a9b (diff) | |
| parent | 10c4a0aacbae74491002eb477536ed6f387b6cf2 (diff) | |
Snap for 12385180 from 10c4a0aacbae74491002eb477536ed6f387b6cf2 to 24Q4-release
Change-Id: Ie7832fec0d5bc6050a17488a6889618e2869090d
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index cdd48d7bc..d63bbe6e1 100644 --- a/java/java.go +++ b/java/java.go @@ -3345,6 +3345,10 @@ func addCLCFromDep(ctx android.ModuleContext, depModule android.Module, if lib, ok := depModule.(SdkLibraryDependency); ok && lib.sharedLibrary() { // A shared SDK library. This should be added as a top-level CLC element. sdkLib = &depName + } else if lib, ok := depModule.(SdkLibraryComponentDependency); ok && lib.OptionalSdkLibraryImplementation() != nil { + if depModule.Name() == proptools.String(lib.OptionalSdkLibraryImplementation())+".impl" { + sdkLib = lib.OptionalSdkLibraryImplementation() + } } else if ulib, ok := depModule.(ProvidesUsesLib); ok { // A non-SDK library disguised as an SDK library by the means of `provides_uses_lib` // property. This should be handled in the same way as a shared SDK library. |