From ee9ad5d526f8e9f8064ca778883dd31ab27f5e7f Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 11 Sep 2020 13:04:05 +0100 Subject: Remove framework-modules naming scheme The naming_scheme property was not removed as it may be useful for future when migrating to java_sdk_library. Bug: 168301990 Test: m nothing Change-Id: Ie97dd60355a207f1312a2dd910f1fb25b46fd737 --- java/sdk_library.go | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) (limited to 'java') diff --git a/java/sdk_library.go b/java/sdk_library.go index 88cf46826..1a5ef544c 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -575,9 +575,7 @@ func (paths *scopePaths) extractStubsSourceAndApiInfoFromApiStubsProvider(dep an type commonToSdkLibraryAndImportProperties struct { // The naming scheme to use for the components that this module creates. // - // If not specified then it defaults to "default". The other allowable value is - // "framework-modules" which matches the scheme currently used by framework modules - // for the equivalent components represented as separate Soong modules. + // If not specified then it defaults to "default". // // This is a temporary mechanism to simplify conversion from separate modules for each // component that follow a different naming pattern to the default one. @@ -621,8 +619,6 @@ func (c *commonToSdkLibraryAndImport) initCommonAfterDefaultsApplied(ctx android switch schemeProperty { case "default": c.namingScheme = &defaultNamingScheme{} - case "framework-modules": - c.namingScheme = &frameworkModulesNamingScheme{} default: ctx.PropertyErrorf("naming_scheme", "expected 'default' but was %q", schemeProperty) return false @@ -1588,31 +1584,6 @@ func (s *defaultNamingScheme) apiModuleName(scope *apiScope, baseName string) st var _ sdkLibraryComponentNamingScheme = (*defaultNamingScheme)(nil) -type frameworkModulesNamingScheme struct { -} - -func (s *frameworkModulesNamingScheme) moduleSuffix(scope *apiScope) string { - suffix := scope.name - if scope == apiScopeModuleLib { - suffix = "module_libs_" - } - return suffix -} - -func (s *frameworkModulesNamingScheme) stubsLibraryModuleName(scope *apiScope, baseName string) string { - return fmt.Sprintf("%s-stubs-%sapi", baseName, s.moduleSuffix(scope)) -} - -func (s *frameworkModulesNamingScheme) stubsSourceModuleName(scope *apiScope, baseName string) string { - return fmt.Sprintf("%s-stubs-srcs-%sapi", baseName, s.moduleSuffix(scope)) -} - -func (s *frameworkModulesNamingScheme) apiModuleName(scope *apiScope, baseName string) string { - return fmt.Sprintf("%s-api-%sapi", baseName, s.moduleSuffix(scope)) -} - -var _ sdkLibraryComponentNamingScheme = (*frameworkModulesNamingScheme)(nil) - func moduleStubLinkType(name string) (stub bool, ret linkType) { // This suffix-based approach is fragile and could potentially mis-trigger. // TODO(b/155164730): Clean this up when modules no longer reference sdk_lib stubs directly. -- cgit v1.2.3-59-g8ed1b