Merge "Merge multiple compat_config.xml's." am: b4cc0206bb am: a0f21a5a4f

Change-Id: Ie429d350afeee515ceaa012e2c20d5971b7a12da
This commit is contained in:
Automerger Merge Worker
2019-12-19 08:31:38 +00:00

View File

@@ -41,30 +41,11 @@ func (p *platformCompatConfig) GenerateAndroidBuildActions(ctx android.ModuleCon
p.configFile = android.PathForModuleOut(ctx, configFileName).OutputPath
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().
Text(`unzip`).
Flag(`-l`).
BuiltTool(ctx, "process-compat-config").
Input(path).
Text(`| grep`).
Flag(`-q`).
Text(configPath).
Text(`; if [ "$?" = "0" ] ; then`).
Text(`unzip`).
Flag(`-qp`).
Input(path).
Text(configPath).
Text(`>`).
Output(p.configFile).
Text(`; else echo `).
Text(emptyConfig).
Text(`>`).
Output(p.configFile).
Text(`; fi`)
Output(p.configFile)
p.installDirPath = android.PathForModuleInstall(ctx, "etc", "compatconfig")
rule.Build(pctx, ctx, configFileName, "Extract compat/compat_config.xml and install it")