From 91c839566eb43a99ae1f7513be4e4237a85b3553 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Tue, 30 May 2023 19:12:28 +0000 Subject: 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 --- android/sdk_version.go | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'android/sdk_version.go') diff --git a/android/sdk_version.go b/android/sdk_version.go index 08762eff2..80aeb2e69 100644 --- a/android/sdk_version.go +++ b/android/sdk_version.go @@ -84,12 +84,6 @@ func (k SdkKind) String() string { } } -// JavaLibraryName returns the soong module containing the Java APIs of that API surface. -func (k SdkKind) JavaLibraryName(c Config) string { - name := k.DefaultJavaLibraryName() - return JavaApiLibraryName(c, name) -} - // JavaApiLibraryName returns the name of .txt equivalent of a java_library, but does // not check if either module exists. // TODO: Return .txt (single-tree or multi-tree equivalents) based on config @@ -335,11 +329,10 @@ func init() { // Export the name of the soong modules representing the various Java API surfaces. func javaSdkMakeVars(ctx MakeVarsContext) { - ctx.Strict("ANDROID_PUBLIC_STUBS", SdkPublic.JavaLibraryName(ctx.Config())) - ctx.Strict("ANDROID_SYSTEM_STUBS", SdkSystem.JavaLibraryName(ctx.Config())) - ctx.Strict("ANDROID_TEST_STUBS", SdkTest.JavaLibraryName(ctx.Config())) - ctx.Strict("ANDROID_MODULE_LIB_STUBS", SdkModule.JavaLibraryName(ctx.Config())) - ctx.Strict("ANDROID_SYSTEM_SERVER_STUBS", SdkSystemServer.JavaLibraryName(ctx.Config())) - // TODO (jihoonkang): Create a .txt equivalent for core.current.stubs - ctx.Strict("ANDROID_CORE_STUBS", SdkCore.JavaLibraryName(ctx.Config())) + ctx.Strict("ANDROID_PUBLIC_STUBS", SdkPublic.DefaultJavaLibraryName()) + ctx.Strict("ANDROID_SYSTEM_STUBS", SdkSystem.DefaultJavaLibraryName()) + ctx.Strict("ANDROID_TEST_STUBS", SdkTest.DefaultJavaLibraryName()) + ctx.Strict("ANDROID_MODULE_LIB_STUBS", SdkModule.DefaultJavaLibraryName()) + ctx.Strict("ANDROID_SYSTEM_SERVER_STUBS", SdkSystemServer.DefaultJavaLibraryName()) + ctx.Strict("ANDROID_CORE_STUBS", SdkCore.DefaultJavaLibraryName()) } -- cgit v1.2.3-59-g8ed1b