openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Extract sdk registration code into function for reuse 

Test: m nothing
Change-Id: I0d0e36324808831deb9a32f07ca3696125703873
This commit is contained in:
Paul Duffin 2021-03-09 22:59:28 +00:00
parent 667893c657
commit 6d9108f047
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sdk/exports.go
View File

@ -17,8 +17,12 @@ package sdk
import "android/soong/android" import "android/soong/android"
func init() { func init() {
android.RegisterModuleType("module_exports", ModuleExportsFactory) registerModuleExportsBuildComponents(android.InitRegistrationContext)
android.RegisterModuleType("module_exports_snapshot", ModuleExportsSnapshotsFactory) }
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 // module_exports defines the exports of a mainline module. The exports are Soong modules

12
sdk/sdk.go
View File

@ -33,10 +33,14 @@ func init() {
pctx.Import("android/soong/android") pctx.Import("android/soong/android")
pctx.Import("android/soong/java/config") pctx.Import("android/soong/java/config")
android.RegisterModuleType("sdk", SdkModuleFactory) registerSdkBuildComponents(android.InitRegistrationContext)
android.RegisterModuleType("sdk_snapshot", SnapshotModuleFactory) }
android.PreDepsMutators(RegisterPreDepsMutators)
android.PostDepsMutators(RegisterPostDepsMutators) func registerSdkBuildComponents(ctx android.RegistrationContext) {
ctx.RegisterModuleType("sdk", SdkModuleFactory)
ctx.RegisterModuleType("sdk_snapshot", SnapshotModuleFactory)
ctx.PreDepsMutators(RegisterPreDepsMutators)
ctx.PostDepsMutators(RegisterPostDepsMutators)
} }
type sdk struct { type sdk struct {

8
sdk/testing.go
View File

@ -122,12 +122,8 @@ func testSdkContext(bp string, fs map[string][]byte, extraOsTypes []android.OsTy
ctx.PostDepsMutators(apex.RegisterPostDepsMutators) ctx.PostDepsMutators(apex.RegisterPostDepsMutators)
// from this package // from this package
ctx.RegisterModuleType("sdk", SdkModuleFactory) registerModuleExportsBuildComponents(ctx)
ctx.RegisterModuleType("sdk_snapshot", SnapshotModuleFactory) registerSdkBuildComponents(ctx)
ctx.RegisterModuleType("module_exports", ModuleExportsFactory)
ctx.RegisterModuleType("module_exports_snapshot", ModuleExportsSnapshotsFactory)
ctx.PreDepsMutators(RegisterPreDepsMutators)
ctx.PostDepsMutators(RegisterPostDepsMutators)
ctx.Register() ctx.Register()