diff options
| author | 2025-02-03 23:49:27 +0000 | |
|---|---|---|
| committer | 2025-02-04 21:48:41 +0000 | |
| commit | 68fb7cb68da47e36d80285e69b1d597ea7d6dbea (patch) | |
| tree | e8329eb85fff59f89ea64f380d65fdaff772d1e2 | |
| parent | d718aa50572113b2b07a0e33a97eaa032a1be387 (diff) | |
Fixes for missing rules in m --soong-only
This CL
1. Disables filesystem diff test if there is no kati invocation, since
there will not be a file_list.txt to do the comparison
2. Disables installation for goBinary if it is in an unexported
namespace.
Test: m checkbuild --soong-build (top of stack)
Bug: 394096939
Change-Id: I5057c2cc431f5e8db12816c3dacf69b3159e18d5
| -rw-r--r-- | fsgen/filesystem_creator.go | 4 | ||||
| -rw-r--r-- | golang/golang.go | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go index 9dcbec1c0..63d079125 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -1163,6 +1163,10 @@ func (f *filesystemCreator) GenerateAndroidBuildActions(ctx android.ModuleContex ctx.Phony("product_config_to_bp", generatedBp) + if !ctx.Config().KatiEnabled() { + // Cannot diff since the kati packaging rules will not be created. + return + } var diffTestFiles []android.Path for _, partitionType := range partitions.types() { diffTestFile := f.createFileListDiffTest(ctx, partitionType, partitions.nameForType(partitionType)) diff --git a/golang/golang.go b/golang/golang.go index 3422f8bdf..9e0744aaf 100644 --- a/golang/golang.go +++ b/golang/golang.go @@ -101,7 +101,7 @@ func (g *GoBinary) GenerateAndroidBuildActions(ctx android.ModuleContext) { // Modules in an unexported namespace have no install rule, only add modules in the exported namespaces // to the blueprint_tools phony rules. - if (!ctx.Config().KatiEnabled() || g.ExportedToMake()) && !usedByBootstrap(ctx.ModuleName()) { + if g.ExportedToMake() && !usedByBootstrap(ctx.ModuleName()) { // Don't add the installed file of bootstrap tools to the deps of `blueprint_tools`. // The install command line will differ from what was used during bootstrap, // which will cause ninja to rebuild the module on the next run, |