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

Merge "Merge multiple compat_config.xml's."

Browse Source 
am: b4cc0206bb

Change-Id: Ib4da2a767b58ba9e9ac5519a04a21d8e8b94e6e3
This commit is contained in:
Mathew Inwood
2019-12-19 00:12:06 -08:00
committed by android-build-merger
parent c945626671 b4cc0206bb
commit a0f21a5a4f
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
java/platform_compat_config.go
View File

@@ -41,30 +41,11 @@ func (p *platformCompatConfig) GenerateAndroidBuildActions(ctx android.ModuleCon
p.configFile = android.PathForModuleOut(ctx, configFileName).OutputPath p.configFile = android.PathForModuleOut(ctx, configFileName).OutputPath
path := android.PathForModuleSrc(ctx, String(p.properties.Src)) path := android.PathForModuleSrc(ctx, String(p.properties.Src))
// Use the empty config if the compat config file idoesn't exist (can happen if @ChangeId
// annotation is not used).
emptyConfig := `'<?xml version="1.0" encoding="UTF-8" standalone="no"?><config/>'`
configPath := `compat/compat_config.xml`
rule.Command(). rule.Command().
Text(`unzip`). BuiltTool(ctx, "process-compat-config").
Flag(`-l`).
Input(path). Input(path).
Text(`| grep`).
Flag(`-q`).
Text(configPath).
Text(`; if [ "$?" = "0" ] ; then`).
Text(`unzip`).
Flag(`-qp`).
Input(path).
Text(configPath).
Text(`>`). Text(`>`).
Output(p.configFile). Output(p.configFile)
Text(`; else echo `).
Text(emptyConfig).
Text(`>`).
Output(p.configFile).
Text(`; fi`)
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")