diff options
author | Dan Willemsen <dwillemsen@google.com> | 2015-09-18 12:48:23 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2015-09-18 12:48:44 -0700 |
commit | e9862da7dd8d9911d26472248294069ba4f3e515 (patch) | |
tree | 19cc171b25fbb2a1242d95e7e7d46e9f5f7f1088 /build.ninja.in | |
parent | 2738597af04d3795434dea7637528d5a63e4aff3 (diff) | |
download | build_soong-e9862da7dd8d9911d26472248294069ba4f3e515.tar.gz build_soong-e9862da7dd8d9911d26472248294069ba4f3e515.tar.bz2 build_soong-e9862da7dd8d9911d26472248294069ba4f3e515.zip |
Update build.ninja.in for blueprint update
Change-Id: I71df8cd5f628855072f1a07e2be150d3e022344a
Diffstat (limited to 'build.ninja.in')
-rw-r--r-- | build.ninja.in | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/build.ninja.in b/build.ninja.in index d46df703..afb2cb5d 100644 --- a/build.ninja.in +++ b/build.ninja.in @@ -25,6 +25,8 @@ g.bootstrap.goRoot = @@GoRoot@@ g.bootstrap.goTestMainCmd = ${g.bootstrap.buildDir}/.bootstrap/bin/gotestmain +g.bootstrap.goTestRunnerCmd = ${g.bootstrap.buildDir}/.bootstrap/bin/gotestrunner + g.bootstrap.linkCmd = @@GoLink@@ g.bootstrap.srcDir = @@SrcDir@@ @@ -57,7 +59,7 @@ rule g.bootstrap.link description = link ${out} rule g.bootstrap.test - command = (cd ${pkgSrcDir} && $$OLDPWD/${in} -test.short) && touch ${out} + command = ${g.bootstrap.goTestRunnerCmd} -p ${pkgSrcDir} -f ${out} -- ${in} -test.short description = test ${pkg} # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # @@ -122,7 +124,8 @@ default ${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test build ${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test.passed: $ g.bootstrap.test $ - ${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test + ${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test | $ + ${g.bootstrap.goTestRunnerCmd} pkg = github.com/google/blueprint pkgSrcDir = ${g.bootstrap.srcDir}/build/blueprint default ${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test.passed @@ -262,7 +265,8 @@ default ${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/test/test build ${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/test/test.passed: $ g.bootstrap.test $ - ${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/test/test + ${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/test/test | $ + ${g.bootstrap.goTestRunnerCmd} pkg = github.com/google/blueprint/parser pkgSrcDir = ${g.bootstrap.srcDir}/build/blueprint/parser default ${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/test/test.passed @@ -323,7 +327,8 @@ default ${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/test/test build ${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/test/test.passed: $ g.bootstrap.test $ - ${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/test/test + ${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/test/test | $ + ${g.bootstrap.goTestRunnerCmd} pkg = github.com/google/blueprint/pathtools pkgSrcDir = ${g.bootstrap.srcDir}/build/blueprint/pathtools default $ @@ -361,7 +366,7 @@ default $ # Variant: # Type: bootstrap_core_go_binary # Factory: github.com/google/blueprint/bootstrap.newGoBinaryModuleFactory.func1 -# Defined: build/blueprint/Blueprints:127:1 +# Defined: build/blueprint/Blueprints:132:1 build ${g.bootstrap.buildDir}/.bootstrap/choosestage/obj/choosestage.a: $ g.bootstrap.compile $ @@ -403,6 +408,29 @@ build ${g.bootstrap.BinDir}/gotestmain: g.bootstrap.cp $ default ${g.bootstrap.BinDir}/gotestmain # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # +# Module: gotestrunner +# Variant: +# Type: bootstrap_core_go_binary +# Factory: github.com/google/blueprint/bootstrap.newGoBinaryModuleFactory.func1 +# Defined: build/blueprint/Blueprints:127:1 + +build ${g.bootstrap.buildDir}/.bootstrap/gotestrunner/obj/gotestrunner.a: $ + g.bootstrap.compile $ + ${g.bootstrap.srcDir}/build/blueprint/gotestrunner/gotestrunner.go | $ + ${g.bootstrap.compileCmd} + pkgPath = gotestrunner +default ${g.bootstrap.buildDir}/.bootstrap/gotestrunner/obj/gotestrunner.a + +build ${g.bootstrap.buildDir}/.bootstrap/gotestrunner/obj/a.out: $ + g.bootstrap.link $ + ${g.bootstrap.buildDir}/.bootstrap/gotestrunner/obj/gotestrunner.a | $ + ${g.bootstrap.linkCmd} +default ${g.bootstrap.buildDir}/.bootstrap/gotestrunner/obj/a.out +build ${g.bootstrap.BinDir}/gotestrunner: g.bootstrap.cp $ + ${g.bootstrap.buildDir}/.bootstrap/gotestrunner/obj/a.out +default ${g.bootstrap.BinDir}/gotestrunner + +# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Module: minibp # Variant: # Type: bootstrap_core_go_binary @@ -453,7 +481,8 @@ build ${g.bootstrap.buildDir}/.bootstrap/primary.ninja.in $ ${g.bootstrap.buildDir}/.bootstrap/primary.ninja.in.timestamp: $ s.bootstrap.primarybp ${g.bootstrap.srcDir}/Android.bp | $ ${g.bootstrap.BinDir}/choosestage ${g.bootstrap.BinDir}/gotestmain $ - ${g.bootstrap.BinDir}/minibp ${g.bootstrap.srcDir}/Android.bp $ + ${g.bootstrap.BinDir}/gotestrunner ${g.bootstrap.BinDir}/minibp $ + ${g.bootstrap.srcDir}/Android.bp $ ${g.bootstrap.buildDir}/.bootstrap/blueprint/test/github.com/google/blueprint.a $ ${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/test/github.com/google/blueprint/parser.a $ ${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/test/github.com/google/blueprint/pathtools.a |