diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-07-18 19:37:37 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-07-24 14:02:51 -0700 |
| commit | 1e72321e58ef3739c574a23eba2809e53bc3e586 (patch) | |
| tree | a6ffdb60d6017f66ba488fa8016a9106251f23ba /bootstrap/command.go | |
| parent | 7dafbbcf6a756e40c58d0da6b306c9b3202218dd (diff) | |
| download | android_build_blueprint-1e72321e58ef3739c574a23eba2809e53bc3e586.tar.gz android_build_blueprint-1e72321e58ef3739c574a23eba2809e53bc3e586.tar.bz2 android_build_blueprint-1e72321e58ef3739c574a23eba2809e53bc3e586.zip | |
Use microfactory to build the bootstrap minibp
This duplicates building common blueprint go packages between minibp and
the primary builder, but drastically simplifies the first stage,
removing the need to check in a generated build.ninja.in.
Change-Id: I639a9637f1ed36d4210823ef276c0f7a064a83bd
Diffstat (limited to 'bootstrap/command.go')
| -rw-r--r-- | bootstrap/command.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/bootstrap/command.go b/bootstrap/command.go index 7c220e5..e7822c3 100644 --- a/bootstrap/command.go +++ b/bootstrap/command.go @@ -45,7 +45,7 @@ var ( ) func init() { - flag.StringVar(&outFile, "o", "build.ninja.in", "the Ninja file to output") + flag.StringVar(&outFile, "o", "build.ninja", "the Ninja file to output") flag.StringVar(&BuildDir, "b", ".", "the build output directory") flag.StringVar(&depFile, "d", "", "the dependency file to output") flag.StringVar(&docFile, "docs", "", "build documentation file to output") @@ -95,9 +95,6 @@ func Main(ctx *blueprint.Context, config interface{}, extraNinjaFileDeps ...stri stage := StageMain if c, ok := config.(ConfigInterface); ok { - if c.GeneratingBootstrapper() { - stage = StageBootstrap - } if c.GeneratingPrimaryBuilder() { stage = StagePrimary } @@ -111,7 +108,6 @@ func Main(ctx *blueprint.Context, config interface{}, extraNinjaFileDeps ...stri ctx.RegisterBottomUpMutator("bootstrap_plugin_deps", pluginDeps) ctx.RegisterModuleType("bootstrap_go_package", newGoPackageModuleFactory(bootstrapConfig)) - ctx.RegisterModuleType("bootstrap_core_go_binary", newGoBinaryModuleFactory(bootstrapConfig, StageBootstrap)) ctx.RegisterModuleType("bootstrap_go_binary", newGoBinaryModuleFactory(bootstrapConfig, StagePrimary)) ctx.RegisterModuleType("blueprint_go_binary", newGoBinaryModuleFactory(bootstrapConfig, StageMain)) ctx.RegisterTopDownMutator("bootstrap_stage", propagateStageBootstrap) |