Regenerate build.ninja.in

Ie922dfc59787514b55fd15e7b97728732714e939 updates
build/blueprint/build.ninja.in, update soongs to match to avoid
rebuilding minibp after every bootstrap.

Bug: 63720725
Test: m -j && m -j
Change-Id: Ib06bc39efae148aaa6d5d8c2ac1b1d41d8ec00d9
This commit is contained in:
Colin Cross 2017-07-14 22:01:54 -07:00
parent da4a7257b5
commit a40331cdc9

View file

@ -436,7 +436,7 @@ default $
# Variant:
# Type: bootstrap_core_go_binary
# Factory: github.com/google/blueprint/bootstrap.newGoBinaryModuleFactory.func1
# Defined: build/blueprint/Blueprints:130:1
# Defined: build/blueprint/Blueprints:131:1
build ${g.bootstrap.buildDir}/.bootstrap/bpglob/obj/bpglob.a: $
g.bootstrap.compile $
@ -464,7 +464,7 @@ default ${g.bootstrap.BinDir}/bpglob
# Variant:
# Type: bootstrap_core_go_binary
# Factory: github.com/google/blueprint/bootstrap.newGoBinaryModuleFactory.func1
# Defined: build/blueprint/Blueprints:148:1
# Defined: build/blueprint/Blueprints:149:1
build ${g.bootstrap.buildDir}/.bootstrap/gotestmain/obj/gotestmain.a: $
g.bootstrap.compile $
@ -483,12 +483,69 @@ build ${g.bootstrap.BinDir}/gotestmain: g.bootstrap.cp $
${g.bootstrap.buildDir}/.bootstrap/gotestmain/obj/a.out
default ${g.bootstrap.BinDir}/gotestmain
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Module: gotestmain-tests
# Variant:
# Type: bootstrap_go_package
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModuleFactory.func1
# Defined: build/blueprint/Blueprints:156:1
build $
${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/github.com/google/blueprint/gotestmain.a $
: g.bootstrap.compile $
${g.bootstrap.srcDir}/build/blueprint/gotestmain/dummy.go $
${g.bootstrap.srcDir}/build/blueprint/gotestmain/testmain_test.go | $
${g.bootstrap.compileCmd}
pkgPath = github.com/google/blueprint/gotestmain
default $
${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/github.com/google/blueprint/gotestmain.a
build ${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/test.go: $
g.bootstrap.gotestmain $
${g.bootstrap.srcDir}/build/blueprint/gotestmain/testmain_test.go | $
${g.bootstrap.goTestMainCmd}
pkg = github.com/google/blueprint/gotestmain
default ${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/test.go
build ${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/test.a: $
g.bootstrap.compile $
${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/test.go | $
${g.bootstrap.compileCmd} $
${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/github.com/google/blueprint/gotestmain.a
incFlags = -I ${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test
pkgPath = main
default ${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/test.a
build ${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/test: $
g.bootstrap.link $
${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/test.a | $
${g.bootstrap.linkCmd}
libDirFlags = -L ${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test
default ${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/test
build ${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/test.passed: $
g.bootstrap.test $
${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/test | $
${g.bootstrap.goTestRunnerCmd}
pkg = github.com/google/blueprint/gotestmain
pkgSrcDir = ${g.bootstrap.srcDir}/build/blueprint/gotestmain
default ${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/test.passed
build $
${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/pkg/github.com/google/blueprint/gotestmain.a $
: g.bootstrap.compile $
${g.bootstrap.srcDir}/build/blueprint/gotestmain/dummy.go | $
${g.bootstrap.compileCmd}
pkgPath = github.com/google/blueprint/gotestmain
default $
${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/pkg/github.com/google/blueprint/gotestmain.a
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Module: gotestrunner
# Variant:
# Type: bootstrap_core_go_binary
# Factory: github.com/google/blueprint/bootstrap.newGoBinaryModuleFactory.func1
# Defined: build/blueprint/Blueprints:153:1
# Defined: build/blueprint/Blueprints:167:1
build ${g.bootstrap.buildDir}/.bootstrap/gotestrunner/obj/gotestrunner.a: $
g.bootstrap.compile $
@ -524,15 +581,16 @@ build ${g.bootstrap.buildDir}/.bootstrap/minibp/obj/minibp.a: $
${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $
${g.bootstrap.buildDir}/.bootstrap/blueprint/pkg/github.com/google/blueprint.a $
${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap-bpdoc/pkg/github.com/google/blueprint/bootstrap/bpdoc.a $
${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a
incFlags = -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-deptools/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap-bpdoc/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap/pkg
${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a $
${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/pkg/github.com/google/blueprint/gotestmain.a
incFlags = -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-deptools/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap-bpdoc/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap/pkg -I ${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/pkg
pkgPath = minibp
default ${g.bootstrap.buildDir}/.bootstrap/minibp/obj/minibp.a
build ${g.bootstrap.buildDir}/.bootstrap/minibp/obj/a.out: g.bootstrap.link $
${g.bootstrap.buildDir}/.bootstrap/minibp/obj/minibp.a | $
${g.bootstrap.linkCmd}
libDirFlags = -L ${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg -L ${g.bootstrap.buildDir}/.bootstrap/blueprint-deptools/pkg -L ${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg -L ${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg -L ${g.bootstrap.buildDir}/.bootstrap/blueprint/pkg -L ${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap-bpdoc/pkg -L ${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap/pkg
libDirFlags = -L ${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg -L ${g.bootstrap.buildDir}/.bootstrap/blueprint-deptools/pkg -L ${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg -L ${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg -L ${g.bootstrap.buildDir}/.bootstrap/blueprint/pkg -L ${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap-bpdoc/pkg -L ${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap/pkg -L ${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/pkg
default ${g.bootstrap.buildDir}/.bootstrap/minibp/obj/a.out
build ${g.bootstrap.BinDir}/minibp: g.bootstrap.cp $
@ -540,7 +598,8 @@ build ${g.bootstrap.BinDir}/minibp: g.bootstrap.cp $
${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/test/test.passed $
${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/test/test.passed $
${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/test/test.passed $
${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test.passed
${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test.passed $
${g.bootstrap.buildDir}/.bootstrap/gotestmain-tests/test/test.passed
default ${g.bootstrap.BinDir}/minibp
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #