7d0dddd84d
tl;dr: Read if you don't use the wrapper or use SKIP_NINJA
Previously, we were relying on the ninja behavior of restarting the
build when the build.ninja file was updated to switch between different
bootstrap stages. But that means that every step that could produce a
build.ninja must pass in order to switch to a different stage. That
wasn't a big problem when we had a two stage build -- there was very
little that could fail in the second stage before we chose to go back to
the first stage. But when we had a three stage build, it was possible to
get into a state (usually during development) where you were in the
second stage, but the build was failing because the first stage needed
to be run. This was fixed in d79f1af742
by adding a wrapper that always started building at the first stage.
But this kept all of the complexity of using ninja restarts without any
of the benefits, so this change removes that complexity and just runs
each stage sequentially in the wrapper. So the wrapper is now required.
Since we're no longer going through choosestage, we can also skip the
template parsing for the later stages that don't need to be templated --
this can save a couple of seconds for large files.
In addition to all of the above, this also lets Soong reduce the number
of times the main ninja file is loaded. We had been running the wrapper
once (3 stages), then running ninja again after combining the
Soong-generated build.ninja with the Kati-generated build.ninja. This
change lets us removing the intermediate parsing of Soong's build.ninja,
so that we only execute ninja 3 times per build. It also lets us have
dependencies on pools or rules from Kati in the primary builder, since
we're never executing the main build.ninja without the Kati build.ninja.
The wrapper has a new option, NINJA to provide the path to ninja. This
used to be hardcoded to `ninja`, and will still default to that. But
we'll be running the first two bootstrap stages with $NINJA even if
SKIP_NINJA is set.
The wrapper passes "-w dupbuild=err" to ninja now -- this really should
always be turned on if you care about reliable builds.
Change-Id: I6f656b74eb3d064b8b9e69d1d6dac1129d72b747
148 lines
3.2 KiB
Text
148 lines
3.2 KiB
Text
bootstrap_go_package(
|
|
name = "blueprint",
|
|
deps = [
|
|
"blueprint-parser",
|
|
"blueprint-pathtools",
|
|
"blueprint-proptools",
|
|
],
|
|
pkgPath = "github.com/google/blueprint",
|
|
srcs = [
|
|
"context.go",
|
|
"fs.go",
|
|
"live_tracker.go",
|
|
"mangle.go",
|
|
"module_ctx.go",
|
|
"ninja_defs.go",
|
|
"ninja_strings.go",
|
|
"ninja_writer.go",
|
|
"package_ctx.go",
|
|
"scope.go",
|
|
"singleton_ctx.go",
|
|
"unpack.go",
|
|
],
|
|
testSrcs = [
|
|
"context_test.go",
|
|
"ninja_strings_test.go",
|
|
"ninja_writer_test.go",
|
|
"splice_modules_test.go",
|
|
"unpack_test.go",
|
|
"visit_test.go",
|
|
],
|
|
)
|
|
|
|
bootstrap_go_package(
|
|
name = "blueprint-parser",
|
|
pkgPath = "github.com/google/blueprint/parser",
|
|
srcs = [
|
|
"parser/ast.go",
|
|
"parser/modify.go",
|
|
"parser/parser.go",
|
|
"parser/printer.go",
|
|
"parser/sort.go",
|
|
],
|
|
testSrcs = [
|
|
"parser/parser_test.go",
|
|
"parser/printer_test.go",
|
|
],
|
|
)
|
|
|
|
bootstrap_go_package(
|
|
name = "blueprint-deptools",
|
|
pkgPath = "github.com/google/blueprint/deptools",
|
|
srcs = ["deptools/depfile.go"],
|
|
)
|
|
|
|
bootstrap_go_package(
|
|
name = "blueprint-pathtools",
|
|
pkgPath = "github.com/google/blueprint/pathtools",
|
|
srcs = [
|
|
"pathtools/lists.go",
|
|
"pathtools/glob.go",
|
|
],
|
|
testSrcs = [
|
|
"pathtools/glob_test.go",
|
|
],
|
|
)
|
|
|
|
bootstrap_go_package(
|
|
name = "blueprint-proptools",
|
|
pkgPath = "github.com/google/blueprint/proptools",
|
|
srcs = [
|
|
"proptools/clone.go",
|
|
"proptools/extend.go",
|
|
"proptools/proptools.go",
|
|
"proptools/typeequal.go",
|
|
],
|
|
testSrcs = [
|
|
"proptools/clone_test.go",
|
|
"proptools/extend_test.go",
|
|
"proptools/typeequal_test.go",
|
|
],
|
|
)
|
|
|
|
bootstrap_go_package(
|
|
name = "blueprint-bootstrap",
|
|
deps = [
|
|
"blueprint",
|
|
"blueprint-deptools",
|
|
"blueprint-pathtools",
|
|
"blueprint-bootstrap-bpdoc",
|
|
],
|
|
pkgPath = "github.com/google/blueprint/bootstrap",
|
|
srcs = [
|
|
"bootstrap/bootstrap.go",
|
|
"bootstrap/cleanup.go",
|
|
"bootstrap/command.go",
|
|
"bootstrap/config.go",
|
|
"bootstrap/doc.go",
|
|
"bootstrap/writedocs.go",
|
|
],
|
|
)
|
|
|
|
bootstrap_go_package(
|
|
name = "blueprint-bootstrap-bpdoc",
|
|
deps = [
|
|
"blueprint",
|
|
"blueprint-proptools",
|
|
],
|
|
pkgPath = "github.com/google/blueprint/bootstrap/bpdoc",
|
|
srcs = [
|
|
"bootstrap/bpdoc/bpdoc.go",
|
|
],
|
|
)
|
|
|
|
bootstrap_core_go_binary(
|
|
name = "minibp",
|
|
deps = [
|
|
"blueprint",
|
|
"blueprint-bootstrap",
|
|
],
|
|
srcs = ["bootstrap/minibp/main.go"],
|
|
)
|
|
|
|
blueprint_go_binary(
|
|
name = "bpfmt",
|
|
deps = ["blueprint-parser"],
|
|
srcs = ["bpfmt/bpfmt.go"],
|
|
)
|
|
|
|
blueprint_go_binary(
|
|
name = "bpmodify",
|
|
deps = ["blueprint-parser"],
|
|
srcs = ["bpmodify/bpmodify.go"],
|
|
)
|
|
|
|
bootstrap_core_go_binary(
|
|
name = "gotestmain",
|
|
srcs = ["gotestmain/gotestmain.go"],
|
|
)
|
|
|
|
bootstrap_core_go_binary(
|
|
name = "gotestrunner",
|
|
srcs = ["gotestrunner/gotestrunner.go"],
|
|
)
|
|
|
|
bootstrap_go_binary{
|
|
name = "loadplugins",
|
|
srcs = ["loadplugins/loadplugins.go"],
|
|
}
|