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

Merge "apex: skip apex_sepolicy_tests for test apex" into main am: 47f87dddb3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2954769

Change-Id: I52f70ef23c6971a406d35bf8201a0d4e5e309be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jooyung Han
2024-02-08 01:59:01 +00:00
committed by Automerger Merge Worker
parent 83c08b0224 47f87dddb3
commit ca4c122503
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/builder.go
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 {