diff options
| -rw-r--r-- | sdk/exports.go | 8 | ||||
| -rw-r--r-- | sdk/sdk.go | 12 | ||||
| -rw-r--r-- | sdk/testing.go | 8 |
3 files changed, 16 insertions, 12 deletions
diff --git a/sdk/exports.go b/sdk/exports.go index d3130574e..9a0ba4e32 100644 --- a/sdk/exports.go +++ b/sdk/exports.go @@ -17,8 +17,12 @@ package sdk import "android/soong/android" func init() { - android.RegisterModuleType("module_exports", ModuleExportsFactory) - android.RegisterModuleType("module_exports_snapshot", ModuleExportsSnapshotsFactory) + registerModuleExportsBuildComponents(android.InitRegistrationContext) +} + +func registerModuleExportsBuildComponents(ctx android.RegistrationContext) { + ctx.RegisterModuleType("module_exports", ModuleExportsFactory) + ctx.RegisterModuleType("module_exports_snapshot", ModuleExportsSnapshotsFactory) } // module_exports defines the exports of a mainline module. The exports are Soong modules diff --git a/sdk/sdk.go b/sdk/sdk.go index f3d075022..2c84a2e88 100644 --- a/sdk/sdk.go +++ b/sdk/sdk.go @@ -33,10 +33,14 @@ func init() { pctx.Import("android/soong/android") pctx.Import("android/soong/java/config") - android.RegisterModuleType("sdk", SdkModuleFactory) - android.RegisterModuleType("sdk_snapshot", SnapshotModuleFactory) - android.PreDepsMutators(RegisterPreDepsMutators) - android.PostDepsMutators(RegisterPostDepsMutators) + registerSdkBuildComponents(android.InitRegistrationContext) +} + +func registerSdkBuildComponents(ctx android.RegistrationContext) { + ctx.RegisterModuleType("sdk", SdkModuleFactory) + ctx.RegisterModuleType("sdk_snapshot", SnapshotModuleFactory) + ctx.PreDepsMutators(RegisterPreDepsMutators) + ctx.PostDepsMutators(RegisterPostDepsMutators) } type sdk struct { diff --git a/sdk/testing.go b/sdk/testing.go index 7a2540a27..4e31b0463 100644 --- a/sdk/testing.go +++ b/sdk/testing.go @@ -122,12 +122,8 @@ func testSdkContext(bp string, fs map[string][]byte, extraOsTypes []android.OsTy ctx.PostDepsMutators(apex.RegisterPostDepsMutators) // from this package - ctx.RegisterModuleType("sdk", SdkModuleFactory) - ctx.RegisterModuleType("sdk_snapshot", SnapshotModuleFactory) - ctx.RegisterModuleType("module_exports", ModuleExportsFactory) - ctx.RegisterModuleType("module_exports_snapshot", ModuleExportsSnapshotsFactory) - ctx.PreDepsMutators(RegisterPreDepsMutators) - ctx.PostDepsMutators(RegisterPostDepsMutators) + registerModuleExportsBuildComponents(ctx) + registerSdkBuildComponents(ctx) ctx.Register() |