diff options
| author | 2023-05-30 19:12:28 +0000 | |
|---|---|---|
| committer | 2023-06-05 21:45:01 +0000 | |
| commit | 91c839566eb43a99ae1f7513be4e4237a85b3553 (patch) | |
| tree | c10da320a3773da6ece7d8fc60193f425c73163e /java/base.go | |
| parent | 67b64432583943cf6483764d771758fe4ae57637 (diff) | |
Cleanup android.JavaApiLibraryName references
This change cleans up references to android.JavaApiLibraryName() so that
rdeps link against "android_*_stubs_current" instead of
"android_*_stubs_current.from-text".
Bug: 284995489
Test: m
Change-Id: Ibdf33b15981317c43e468dbc1657229d54bbd226
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/java/base.go b/java/base.go index 78c8d6011..ed61e12ed 100644 --- a/java/base.go +++ b/java/base.go @@ -1928,22 +1928,22 @@ type moduleWithSdkDep interface { func (m *Module) getSdkLinkType(ctx android.BaseModuleContext, name string) (ret sdkLinkType, stubs bool) { switch name { - case android.SdkCore.JavaLibraryName(ctx.Config()), - android.JavaApiLibraryName(ctx.Config(), "legacy.core.platform.api.stubs"), - android.JavaApiLibraryName(ctx.Config(), "stable.core.platform.api.stubs"), + case android.SdkCore.DefaultJavaLibraryName(), + "legacy.core.platform.api.stubs", + "stable.core.platform.api.stubs", "stub-annotations", "private-stub-annotations-jar", - android.JavaApiLibraryName(ctx.Config(), "core-lambda-stubs"), + "core-lambda-stubs", "core-generated-annotation-stubs": return javaCore, true - case android.SdkPublic.JavaLibraryName(ctx.Config()): + case android.SdkPublic.DefaultJavaLibraryName(): return javaSdk, true - case android.SdkSystem.JavaLibraryName(ctx.Config()): + case android.SdkSystem.DefaultJavaLibraryName(): return javaSystem, true - case android.SdkModule.JavaLibraryName(ctx.Config()): + case android.SdkModule.DefaultJavaLibraryName(): return javaModule, true - case android.SdkSystemServer.JavaLibraryName(ctx.Config()): + case android.SdkSystemServer.DefaultJavaLibraryName(): return javaSystemServer, true - case android.SdkTest.JavaLibraryName(ctx.Config()): + case android.SdkTest.DefaultJavaLibraryName(): return javaSystem, true } |