diff options
Diffstat (limited to 'golang/golang.go')
| -rw-r--r-- | golang/golang.go | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/golang/golang.go b/golang/golang.go index 6ee924f1d..9e0744aaf 100644 --- a/golang/golang.go +++ b/golang/golang.go @@ -47,7 +47,7 @@ type GoPackage struct { func goPackageModuleFactory() android.Module { module := &GoPackage{} module.AddProperties(module.Properties()...) - android.InitAndroidArchModule(module, android.HostSupportedNoCross, android.MultilibFirst) + android.InitAndroidArchModule(module, android.HostSupported, android.MultilibFirst) return module } @@ -74,7 +74,7 @@ type GoBinary struct { func goBinaryModuleFactory() android.Module { module := &GoBinary{} module.AddProperties(module.Properties()...) - android.InitAndroidArchModule(module, android.HostSupportedNoCross, android.MultilibFirst) + android.InitAndroidArchModule(module, android.HostSupported, android.MultilibFirst) return module } @@ -97,17 +97,16 @@ func (g *GoBinary) GenerateAndroidBuildActions(ctx android.ModuleContext) { outputFile := android.PathForArbitraryOutput(ctx, android.Rel(ctx, ctx.Config().OutDir(), g.IntermediateFile())).WithoutRel() g.outputFile = outputFile - // Don't create install rules for modules used by bootstrap, the install command line will differ from - // what was used during bootstrap, which will cause ninja to rebuild the module on the next run, - // triggering reanalysis. - if !usedByBootstrap(ctx.ModuleName()) { - installPath := ctx.InstallFile(android.PathForModuleInstall(ctx, "bin"), ctx.ModuleName(), outputFile) - - // 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() { - ctx.Phony("blueprint_tools", installPath) - } + installPath := ctx.InstallFile(android.PathForModuleInstall(ctx, "bin"), ctx.ModuleName(), outputFile) + + // Modules in an unexported namespace have no install rule, only add modules in the exported namespaces + // to the blueprint_tools phony rules. + 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, + // triggering reanalysis. + ctx.Phony("blueprint_tools", installPath) } ctx.SetOutputFiles(android.Paths{outputFile}, "") |