Revert "se_compat_cil: Prepend generated files with a header"

This reverts commit b44e506223.

Reason for revert: secilc is fixed by aosp/1701846, so the workaround is no longer needed

Bug: 183362912
Test: S GSI on R CF boot test
Change-Id: Ic73c7cea1ebe42b483049cbc29f192e738748894
This commit is contained in:
Yo Chiang 2021-05-12 01:53:38 +00:00
parent b44e506223
commit 7c3ecf1356

View file

@ -87,15 +87,6 @@ func (c *compatCil) GenerateAndroidBuildActions(ctx android.ModuleContext) {
srcPaths := c.expandSeSources(ctx)
out := android.PathForModuleGen(ctx, c.Name())
// TODO(b/183362912): Patch secilc to handle empty cil files.
// Put a header so that the generated cil mustn't be empty.
header := android.PathForModuleGen(ctx, c.Name()+"_header")
rule := android.NewRuleBuilder(pctx, ctx)
rule.Command().Text("echo").Flag(proptools.ShellEscape(";; " + c.stem())).Text(">").Output(header)
rule.Build(c.Name()+"_header", "Generate cil header")
srcPaths = append(android.Paths{header}, srcPaths...)
ctx.Build(pctx, android.BuildParams{
Rule: android.Cat,
Inputs: srcPaths,