From 2178762a8aa11aee7705723b12e98c3cead8204e Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 25 Nov 2022 12:48:20 +0000 Subject: Remove SdkAware.SdkMemberComponentName That method was provided to allow a java_sdk_library_import that was part of a versioned sdk snapshot to create the name of its component modules consistent with the way in which modules were named within the sdk snapshot. As versioned sdk snapshots have all been removed this is no longer necessary. Bug: 260237150 Test: m nothing Change-Id: Iee35abd6d210d9a33dfd8ef2f9c77a53329fda24 --- java/sdk_library.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'java/sdk_library.go') diff --git a/java/sdk_library.go b/java/sdk_library.go index 56e555078..012309d4a 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -831,18 +831,14 @@ func (c *commonToSdkLibraryAndImport) xmlPermissionsModuleName() string { // Name of the java_library module that compiles the stubs source. func (c *commonToSdkLibraryAndImport) stubsLibraryModuleName(apiScope *apiScope) string { baseName := c.module.BaseModuleName() - return c.module.SdkMemberComponentName(baseName, func(name string) string { - return c.namingScheme.stubsLibraryModuleName(apiScope, name) - }) + return c.namingScheme.stubsLibraryModuleName(apiScope, baseName) } // Name of the droidstubs module that generates the stubs source and may also // generate/check the API. func (c *commonToSdkLibraryAndImport) stubsSourceModuleName(apiScope *apiScope) string { baseName := c.module.BaseModuleName() - return c.module.SdkMemberComponentName(baseName, func(name string) string { - return c.namingScheme.stubsSourceModuleName(apiScope, name) - }) + return c.namingScheme.stubsSourceModuleName(apiScope, baseName) } // The component names for different outputs of the java_sdk_library. -- cgit v1.2.3-59-g8ed1b