Merge "apex: skip apex_sepolicy_tests for test apex" into main

This commit is contained in:
Jooyung Han 2024-02-08 01:33:07 +00:00 committed by Gerrit Code Review
commit 47f87dddb3

View file

@ -910,7 +910,7 @@ func (a *apexBundle) buildApex(ctx android.ModuleContext) {
var validations android.Paths var validations android.Paths
validations = append(validations, runApexLinkerconfigValidation(ctx, unsignedOutputFile.OutputPath, imageDir.OutputPath)) validations = append(validations, runApexLinkerconfigValidation(ctx, unsignedOutputFile.OutputPath, imageDir.OutputPath))
// TODO(b/279688635) deapexer supports [ext4] // TODO(b/279688635) deapexer supports [ext4]
if suffix == imageApexSuffix && ext4 == a.payloadFsType { if !a.testApex && suffix == imageApexSuffix && ext4 == a.payloadFsType {
validations = append(validations, runApexSepolicyTests(ctx, unsignedOutputFile.OutputPath)) validations = append(validations, runApexSepolicyTests(ctx, unsignedOutputFile.OutputPath))
} }
if !a.testApex && len(a.properties.Unwanted_transitive_deps) > 0 { if !a.testApex && len(a.properties.Unwanted_transitive_deps) > 0 {