diff options
| author | 2025-03-12 18:19:23 -0700 | |
|---|---|---|
| committer | 2025-03-12 18:19:23 -0700 | |
| commit | f19bde5eb26eb6fc7eef66371d0492b5166f26bf (patch) | |
| tree | 63a15b571adb73f3128ca5659b193c82db68a595 | |
| parent | c0045375e52e06fcbfd01486e8bec8e75ab11494 (diff) | |
| parent | b9bce1e16b13dd359bbbe1d30d3edd81f419a4e5 (diff) | |
Merge "Exclude disabled modules in test_package" into main
| -rw-r--r-- | ci_tests/ci_test_package_zip.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ci_tests/ci_test_package_zip.go b/ci_tests/ci_test_package_zip.go index f8c4578b6..87ae6fda2 100644 --- a/ci_tests/ci_test_package_zip.go +++ b/ci_tests/ci_test_package_zip.go @@ -167,6 +167,9 @@ func createOutput(ctx android.ModuleContext, pctx android.PackageContext) androi builder.Command().Text("mkdir").Flag("-p").Output(stagingDir) builder.Temporary(stagingDir) ctx.WalkDeps(func(child, parent android.Module) bool { + if !child.Enabled(ctx) { + return false + } if android.EqualModules(parent, ctx.Module()) && ctx.OtherModuleDependencyTag(child) == testPackageZipDepTag { // handle direct deps extendBuilderCommand(ctx, child, builder, stagingDir, productOut, arch, secondArch) |