StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update build rule for updated script.

Browse Source 
The script now expects flags for filenames and no longer
just writes to stdout. Write full merged config too.

Test: m libcore-platform-compat-config
Change-Id: Ia524a8c271725665772c9543baecd4f494ee86f1
This commit is contained in:
Mathew Inwood
2019-12-17 11:14:42 +00:00
parent b4cc0206bb
commit 0dd06f6ff2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/platform_compat_config.go
View File

@@ -32,20 +32,23 @@ type platformCompatConfig struct {
properties platformCompatConfigProperties properties platformCompatConfigProperties
installDirPath android.InstallPath installDirPath android.InstallPath
configFile android.OutputPath configFile android.OutputPath
metadataFile android.OutputPath
} }
func (p *platformCompatConfig) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (p *platformCompatConfig) GenerateAndroidBuildActions(ctx android.ModuleContext) {
rule := android.NewRuleBuilder() rule := android.NewRuleBuilder()
configFileName := p.Name() + ".xml" configFileName := p.Name() + ".xml"
metadataFileName := p.Name() + "_meta.xml"
p.configFile = android.PathForModuleOut(ctx, configFileName).OutputPath p.configFile = android.PathForModuleOut(ctx, configFileName).OutputPath
p.metadataFile = android.PathForModuleOut(ctx, metadataFileName).OutputPath
path := android.PathForModuleSrc(ctx, String(p.properties.Src)) path := android.PathForModuleSrc(ctx, String(p.properties.Src))
rule.Command(). rule.Command().
BuiltTool(ctx, "process-compat-config"). BuiltTool(ctx, "process-compat-config").
Input(path). FlagWithInput("--jar ", path).
Text(`>`). FlagWithOutput("--device-config ", p.configFile).
Output(p.configFile) FlagWithOutput("--merged-config ", p.metadataFile)
p.installDirPath = android.PathForModuleInstall(ctx, "etc", "compatconfig") p.installDirPath = android.PathForModuleInstall(ctx, "etc", "compatconfig")
rule.Build(pctx, ctx, configFileName, "Extract compat/compat_config.xml and install it") rule.Build(pctx, ctx, configFileName, "Extract compat/compat_config.xml and install it")