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

Merge "Run apex_sepolicy_test for supported fs_type"

Browse Source
This commit is contained in:
Jooyung Han
2023-04-27 01:03:29 +00:00
committed by Gerrit Code Review
parent c741160d81 b7cdbba71e
commit 40a35ee5f9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/builder.go
View File

@@ -231,7 +231,7 @@ var (
apexSepolicyTestsRule = pctx.StaticRule("apexSepolicyTestsRule", blueprint.RuleParams{ apexSepolicyTestsRule = pctx.StaticRule("apexSepolicyTestsRule", blueprint.RuleParams{
Command: `${deapexer} --debugfs_path ${debugfs_static} list -Z ${in} > ${out}.fc` + Command: `${deapexer} --debugfs_path ${debugfs_static} list -Z ${in} > ${out}.fc` +
`&& ${apex_sepolicy_tests} -f ${out}.fc && touch ${out}`, ` && ${apex_sepolicy_tests} -f ${out}.fc && touch ${out}`,
CommandDeps: []string{"${apex_sepolicy_tests}", "${deapexer}", "${debugfs_static}"}, CommandDeps: []string{"${apex_sepolicy_tests}", "${deapexer}", "${debugfs_static}"},
Description: "run apex_sepolicy_tests", Description: "run apex_sepolicy_tests",
}) })
@@ -872,7 +872,8 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
args["outCommaList"] = signedOutputFile.String() args["outCommaList"] = signedOutputFile.String()
} }
var validations android.Paths var validations android.Paths
if suffix == imageApexSuffix { // TODO(b/279688635) deapexer supports [ext4]
if suffix == imageApexSuffix && ext4 == a.payloadFsType {
validations = append(validations, runApexSepolicyTests(ctx, unsignedOutputFile.OutputPath)) validations = append(validations, runApexSepolicyTests(ctx, unsignedOutputFile.OutputPath))
} }
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{