diff options
author | 2023-12-07 13:10:56 -0800 | |
---|---|---|
committer | 2023-12-08 13:51:05 -0800 | |
commit | 8ff105860d20f2ccbb8d8044bf562f94100b7f6a (patch) | |
tree | b01575cd628eb36807b7ca274de28fd6a1971e17 /java/sdk_library.go | |
parent | e51c6e4109e8063e54cf7d8ced1b7da7f9359c34 (diff) |
Remove ConvertWithBp2build implementations
Remove the ConvertWithBp2build implementations from all the module
types, along with the related code.
Bug: 315353489
Test: m blueprint_tests
Change-Id: I212672286686a318893bc7348ddd5a5ec51e77a7
Diffstat (limited to 'java/sdk_library.go')
-rw-r--r-- | java/sdk_library.go | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index fbfe509b8..176bda0ce 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -24,13 +24,10 @@ import ( "strings" "sync" - "android/soong/ui/metrics/bp2build_metrics_proto" - "github.com/google/blueprint" "github.com/google/blueprint/proptools" "android/soong/android" - "android/soong/bazel" "android/soong/dexpreopt" ) @@ -1238,8 +1235,6 @@ type SdkLibraryDependency interface { type SdkLibrary struct { Library - android.BazelModuleBase - sdkLibraryProperties sdkLibraryProperties // Map from api scope to the scope specific property structure. @@ -2318,47 +2313,9 @@ func SdkLibraryFactory() android.Module { module.CreateInternalModules(ctx) } }) - android.InitBazelModule(module) return module } -type bazelSdkLibraryAttributes struct { - Public *bazel.Label - System *bazel.Label - Test *bazel.Label - Module_lib *bazel.Label - System_server *bazel.Label -} - -// java_sdk_library bp2build converter -func (module *SdkLibrary) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) { - if ctx.ModuleType() != "java_sdk_library" { - ctx.MarkBp2buildUnconvertible(bp2build_metrics_proto.UnconvertedReasonType_TYPE_UNSUPPORTED, "") - return - } - - nameToAttr := make(map[string]*bazel.Label) - - for _, scope := range module.getGeneratedApiScopes(ctx) { - apiSurfaceFile := android.BazelLabelForModuleSrcSingle(ctx, path.Join(module.getApiDir(), scope.apiFilePrefix+"current.txt")) - nameToAttr[scope.name] = &apiSurfaceFile - } - - attrs := bazelSdkLibraryAttributes{ - Public: nameToAttr["public"], - System: nameToAttr["system"], - Test: nameToAttr["test"], - Module_lib: nameToAttr["module-lib"], - System_server: nameToAttr["system-server"], - } - props := bazel.BazelTargetModuleProperties{ - Rule_class: "java_sdk_library", - Bzl_load_location: "//build/bazel/rules/java:sdk_library.bzl", - } - - ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, &attrs) -} - // // SDK library prebuilts // @@ -2400,7 +2357,6 @@ type sdkLibraryImportProperties struct { type SdkLibraryImport struct { android.ModuleBase android.DefaultableModuleBase - android.BazelModuleBase prebuilt android.Prebuilt android.ApexModuleBase @@ -2484,7 +2440,6 @@ func sdkLibraryImportFactory() android.Module { android.InitPrebuiltModule(module, &[]string{""}) android.InitApexModule(module) - android.InitBazelModule(module) InitJavaModule(module, android.HostAndDeviceSupported) module.SetDefaultableHook(func(mctx android.DefaultableHookContext) { @@ -2495,33 +2450,6 @@ func sdkLibraryImportFactory() android.Module { return module } -// java_sdk_library bp2build converter -func (i *SdkLibraryImport) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) { - nameToAttr := make(map[string]*bazel.Label) - - for scope, props := range i.scopeProperties { - if api := proptools.String(props.Current_api); api != "" { - apiSurfaceFile := android.BazelLabelForModuleSrcSingle(ctx, api) - nameToAttr[scope.name] = &apiSurfaceFile - } - } - - attrs := bazelSdkLibraryAttributes{ - Public: nameToAttr["public"], - System: nameToAttr["system"], - Test: nameToAttr["test"], - Module_lib: nameToAttr["module-lib"], - System_server: nameToAttr["system-server"], - } - props := bazel.BazelTargetModuleProperties{ - Rule_class: "java_sdk_library", - Bzl_load_location: "//build/bazel/rules/java:sdk_library.bzl", - } - - name := android.RemoveOptionalPrebuiltPrefix(i.Name()) - ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: name}, &attrs) -} - var _ PermittedPackagesForUpdatableBootJars = (*SdkLibraryImport)(nil) func (module *SdkLibraryImport) PermittedPackagesForUpdatableBootJars() []string { |