diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/platform_compat_config.go | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/java/platform_compat_config.go b/java/platform_compat_config.go index 4bfd4e2f9..01e651bfb 100644 --- a/java/platform_compat_config.go +++ b/java/platform_compat_config.go @@ -35,10 +35,6 @@ func platformCompatConfigPath(ctx android.PathContext) android.OutputPath { return android.PathForOutput(ctx, "compat_config", "merged_compat_config.xml") } -type platformCompatConfigSingleton struct { - metadata android.Path -} - type platformCompatConfigProperties struct { Src *string `android:"path"` } @@ -75,42 +71,6 @@ type PlatformCompatConfigIntf interface { var _ PlatformCompatConfigIntf = (*platformCompatConfig)(nil) -// compat singleton rules -func (p *platformCompatConfigSingleton) GenerateBuildActions(ctx android.SingletonContext) { - - var compatConfigMetadata android.Paths - - ctx.VisitAllModules(func(module android.Module) { - if c, ok := module.(PlatformCompatConfigIntf); ok { - metadata := c.compatConfigMetadata() - compatConfigMetadata = append(compatConfigMetadata, metadata) - } - }) - - if compatConfigMetadata == nil { - // nothing to do. - return - } - - rule := android.NewRuleBuilder(pctx, ctx) - outputPath := platformCompatConfigPath(ctx) - - rule.Command(). - BuiltTool("process-compat-config"). - FlagForEachInput("--xml ", compatConfigMetadata). - FlagWithOutput("--merged-config ", outputPath) - - rule.Build("merged-compat-config", "Merge compat config") - - p.metadata = outputPath -} - -func (p *platformCompatConfigSingleton) MakeVars(ctx android.MakeVarsContext) { - if p.metadata != nil { - ctx.Strict("INTERNAL_PLATFORM_MERGED_COMPAT_CONFIG", p.metadata.String()) - } -} - func (p *platformCompatConfig) GenerateAndroidBuildActions(ctx android.ModuleContext) { rule := android.NewRuleBuilder(pctx, ctx) @@ -145,10 +105,6 @@ func (p *platformCompatConfig) AndroidMkEntries() []android.AndroidMkEntries { }} } -func platformCompatConfigSingletonFactory() android.Singleton { - return &platformCompatConfigSingleton{} -} - func PlatformCompatConfigFactory() android.Module { module := &platformCompatConfig{} module.AddProperties(&module.properties) @@ -156,6 +112,50 @@ func PlatformCompatConfigFactory() android.Module { return module } +// compat singleton rules +type platformCompatConfigSingleton struct { + metadata android.Path +} + +func (p *platformCompatConfigSingleton) GenerateBuildActions(ctx android.SingletonContext) { + + var compatConfigMetadata android.Paths + + ctx.VisitAllModules(func(module android.Module) { + if c, ok := module.(PlatformCompatConfigIntf); ok { + metadata := c.compatConfigMetadata() + compatConfigMetadata = append(compatConfigMetadata, metadata) + } + }) + + if compatConfigMetadata == nil { + // nothing to do. + return + } + + rule := android.NewRuleBuilder(pctx, ctx) + outputPath := platformCompatConfigPath(ctx) + + rule.Command(). + BuiltTool("process-compat-config"). + FlagForEachInput("--xml ", compatConfigMetadata). + FlagWithOutput("--merged-config ", outputPath) + + rule.Build("merged-compat-config", "Merge compat config") + + p.metadata = outputPath +} + +func (p *platformCompatConfigSingleton) MakeVars(ctx android.MakeVarsContext) { + if p.metadata != nil { + ctx.Strict("INTERNAL_PLATFORM_MERGED_COMPAT_CONFIG", p.metadata.String()) + } +} + +func platformCompatConfigSingletonFactory() android.Singleton { + return &platformCompatConfigSingleton{} +} + //============== merged_compat_config ================= type globalCompatConfigProperties struct { // name of the file into which the metadata will be copied. |