Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2471c086 authored by Mathew Inwood's avatar Mathew Inwood
Browse files

Merge multiple compat_config.xml's. 

Previously, the compat configs from static dependencies were all written
to compat/compat_config.xml, putting at the mercy of jar file merging and
so potentially losing some config.

Now the annotation processor writes a compat_config.xml for each Java
class that exports config, we we merge them together here with a new
tool.

Test: m
Change-Id: I28c12ff648a01aaad214701fca4f09743638b11b
parent 572aeed6

java/platform_compat_config.go

+2 −21
Original line number Diff line number Diff line
@@ -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`).

		Input(path).

		Text(`| grep`).

		Flag(`-q`).

		Text(configPath).

		Text(`; if [ "$?" = "0" ] ; then`).

		Text(`unzip`).

		Flag(`-qp`).

		BuiltTool(ctx, "process-compat-config").

		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")