diff options
| author | 2024-11-25 19:30:24 +0000 | |
|---|---|---|
| committer | 2024-11-25 19:30:24 +0000 | |
| commit | bd3de8767a424fc946a3ab1ba7a051302b41b058 (patch) | |
| tree | d68bfc15ba2022799a04b77582d6c2d703ef1ef3 /apex/builder.go | |
| parent | 4af20236db2be01181437994a5a6dc2e398fc7c6 (diff) | |
| parent | fc7b83d32b7fdd3fa1cef232640534c94ad8c080 (diff) | |
Merge "Add apex_test.skip_validations" into main am: fc7b83d32b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3367941
Change-Id: Icb2627b5945102dc06da542f7168fef1f399e009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex/builder.go')
| -rw-r--r-- | apex/builder.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apex/builder.go b/apex/builder.go index 04bd5afdb..41e251156 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -912,14 +912,14 @@ func (a *apexBundle) buildApex(ctx android.ModuleContext) { var validations android.Paths validations = append(validations, runApexLinkerconfigValidation(ctx, unsignedOutputFile, imageDir)) // TODO(b/279688635) deapexer supports [ext4] - if !a.testApex && suffix == imageApexSuffix && ext4 == a.payloadFsType { + if !a.skipValidation(apexSepolicyTests) && suffix == imageApexSuffix && ext4 == a.payloadFsType { validations = append(validations, runApexSepolicyTests(ctx, unsignedOutputFile)) } if !a.testApex && len(a.properties.Unwanted_transitive_deps) > 0 { validations = append(validations, runApexElfCheckerUnwanted(ctx, unsignedOutputFile, a.properties.Unwanted_transitive_deps)) } - if !a.testApex && android.InList(a.payloadFsType, []fsType{ext4, erofs}) { + if !a.skipValidation(hostApexVerifier) && android.InList(a.payloadFsType, []fsType{ext4, erofs}) { validations = append(validations, runApexHostVerifier(ctx, a, unsignedOutputFile)) } ctx.Build(pctx, android.BuildParams{ @@ -1208,7 +1208,7 @@ func runApexLinkerconfigValidation(ctx android.ModuleContext, apexFile android.P // $ deapexer list -Z {apex_file} > {file_contexts} // $ apex_sepolicy_tests -f {file_contexts} func runApexSepolicyTests(ctx android.ModuleContext, apexFile android.Path) android.Path { - timestamp := android.PathForModuleOut(ctx, "sepolicy_tests.timestamp") + timestamp := android.PathForModuleOut(ctx, "apex_sepolicy_tests.timestamp") ctx.Build(pctx, android.BuildParams{ Rule: apexSepolicyTestsRule, Input: apexFile, |