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

Commit c772405d authored by Anna Trostanetski's avatar Anna Trostanetski Committed by Gerrit Code Review
Browse files

Merge "Move platform compat config to their own directory."

parents af93360e 87901b05

java/platform_compat_config.go

+6 −7
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ func init() { 


type platformCompatConfigProperties struct {

	Src *string `android:"path"`

	Prefix *string

}



type platformCompatConfig struct {
@@ -38,13 +37,13 @@ type platformCompatConfig struct { 
func (p *platformCompatConfig) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	rule := android.NewRuleBuilder()



	configFileName := String(p.properties.Prefix) + "_platform_compat_config.xml"

	configFileName := p.Name() + ".xml"

	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/>`

	emptyConfig := `'<?xml version="1.0" encoding="UTF-8" standalone="no"?><config/>'`

	configPath := `compat/compat_config.xml`



	rule.Command().
@@ -61,13 +60,13 @@ func (p *platformCompatConfig) GenerateAndroidBuildActions(ctx android.ModuleCon 
		Text(configPath).

		Text(`>`).

		Output(p.configFile).

		Text(`; else echo '`).

		Text(`; else echo `).

		Text(emptyConfig).

		Text(`' >`).

		Text(`>`).

		Output(p.configFile).

		Text(`; fi`)



	p.installDirPath = android.PathForModuleInstall(ctx, "etc", "sysconfig")

	p.installDirPath = android.PathForModuleInstall(ctx, "etc", "compatconfig")

	rule.Build(pctx, ctx, configFileName, "Extract compat/compat_config.xml and install it")



}