diff options
| author | Jooyung Han <jooyung@google.com> | 2024-02-08 02:38:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-08 02:38:46 +0000 |
| commit | 942e4c97690fac274963d5cdbf42dc0e8f9a836a (patch) | |
| tree | 87a9778a23ac5b6cea9434b063272cdc00d9b3ee /apex | |
| parent | ea09d75d4ee19bb32ad0075b79513433810f0937 (diff) | |
| parent | ca4c1225039e06d91c5f34495f46cee92363ae27 (diff) | |
Merge "apex: skip apex_sepolicy_tests for test apex" into main am: 47f87dddb3 am: ca4c122503
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2954769
Change-Id: Ib98ee2e87450995c8c5c95b558e5ec0e51c24e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/builder.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/builder.go b/apex/builder.go index 30788630b..40ccd2cc7 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -910,7 +910,7 @@ func (a *apexBundle) buildApex(ctx android.ModuleContext) { var validations android.Paths validations = append(validations, runApexLinkerconfigValidation(ctx, unsignedOutputFile.OutputPath, imageDir.OutputPath)) // 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)) } if !a.testApex && len(a.properties.Unwanted_transitive_deps) > 0 { |