StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update build.ninja.in for blueprint upgrade"

Browse Source
This commit is contained in:
Dan Willemsen
2016-11-03 02:39:18 +00:00
committed by Gerrit Code Review
parent 318af8be27 627803256f
commit eb716e2559
1 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
build.ninja.in
View File

@@ -7,7 +7,7 @@
# #
# bootstrap [from Go package github.com/google/blueprint/bootstrap] # bootstrap [from Go package github.com/google/blueprint/bootstrap]
# #
ninja_required_version = 1.6.0 ninja_required_version = 1.7.0
g.bootstrap.buildDir = @@BuildDir@@ g.bootstrap.buildDir = @@BuildDir@@
@@ -34,6 +34,12 @@ rule g.bootstrap.bootstrap
description = bootstrap ${in} description = bootstrap ${in}
generator = true generator = true
rule g.bootstrap.build.ninja
command = ${builder} ${extra} -b ${g.bootstrap.buildDir} -d ${out}.d -o ${out} ${in}
depfile = ${out}.d
description = ${builder} ${out}
restat = true
rule g.bootstrap.compile rule g.bootstrap.compile
command = GOROOT='${g.bootstrap.goRoot}' ${g.bootstrap.compileCmd} -o ${out} -p ${pkgPath} -complete ${incFlags} -pack ${in} command = GOROOT='${g.bootstrap.goRoot}' ${g.bootstrap.compileCmd} -o ${out} -p ${pkgPath} -complete ${incFlags} -pack ${in}
description = compile ${out} description = compile ${out}
@@ -120,7 +126,10 @@ default ${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test
build ${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test.passed: $ build ${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test.passed: $
g.bootstrap.test $ g.bootstrap.test $
${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test | $ ${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test | $
${g.bootstrap.goTestRunnerCmd} ${g.bootstrap.goTestRunnerCmd} || $
${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
pkg = github.com/google/blueprint pkg = github.com/google/blueprint
pkgSrcDir = ${g.bootstrap.srcDir}/build/blueprint pkgSrcDir = ${g.bootstrap.srcDir}/build/blueprint
default ${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test.passed default ${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test.passed
@@ -142,8 +151,7 @@ build $
${g.bootstrap.compileCmd} $ ${g.bootstrap.compileCmd} $
${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $ ${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $ ${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $
${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $ ${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a
|| ${g.bootstrap.buildDir}/.bootstrap/blueprint/test/test.passed
incFlags = -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg incFlags = -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg -I ${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg
pkgPath = github.com/google/blueprint pkgPath = github.com/google/blueprint
default $ default $
@@ -276,8 +284,7 @@ build $
${g.bootstrap.srcDir}/build/blueprint/parser/parser.go $ ${g.bootstrap.srcDir}/build/blueprint/parser/parser.go $
${g.bootstrap.srcDir}/build/blueprint/parser/printer.go $ ${g.bootstrap.srcDir}/build/blueprint/parser/printer.go $
${g.bootstrap.srcDir}/build/blueprint/parser/sort.go | $ ${g.bootstrap.srcDir}/build/blueprint/parser/sort.go | $
${g.bootstrap.compileCmd} || $ ${g.bootstrap.compileCmd}
${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/test/test.passed
pkgPath = github.com/google/blueprint/parser pkgPath = github.com/google/blueprint/parser
default $ default $
${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a ${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a
@@ -337,8 +344,7 @@ build $
: g.bootstrap.compile $ : g.bootstrap.compile $
${g.bootstrap.srcDir}/build/blueprint/pathtools/lists.go $ ${g.bootstrap.srcDir}/build/blueprint/pathtools/lists.go $
${g.bootstrap.srcDir}/build/blueprint/pathtools/glob.go | $ ${g.bootstrap.srcDir}/build/blueprint/pathtools/glob.go | $
${g.bootstrap.compileCmd} || $ ${g.bootstrap.compileCmd}
${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/test/test.passed
pkgPath = github.com/google/blueprint/pathtools pkgPath = github.com/google/blueprint/pathtools
default $ default $
${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a ${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a
@@ -410,8 +416,7 @@ build $
${g.bootstrap.srcDir}/build/blueprint/proptools/extend.go $ ${g.bootstrap.srcDir}/build/blueprint/proptools/extend.go $
${g.bootstrap.srcDir}/build/blueprint/proptools/proptools.go $ ${g.bootstrap.srcDir}/build/blueprint/proptools/proptools.go $
${g.bootstrap.srcDir}/build/blueprint/proptools/typeequal.go | $ ${g.bootstrap.srcDir}/build/blueprint/proptools/typeequal.go | $
${g.bootstrap.compileCmd} || $ ${g.bootstrap.compileCmd}
${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/test/test.passed
pkgPath = github.com/google/blueprint/proptools pkgPath = github.com/google/blueprint/proptools
default $ default $
${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a ${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a
@@ -493,40 +498,27 @@ build ${g.bootstrap.buildDir}/.bootstrap/minibp/obj/a.out: g.bootstrap.link $
default ${g.bootstrap.buildDir}/.bootstrap/minibp/obj/a.out default ${g.bootstrap.buildDir}/.bootstrap/minibp/obj/a.out
build ${g.bootstrap.BinDir}/minibp: g.bootstrap.cp $ build ${g.bootstrap.BinDir}/minibp: g.bootstrap.cp $
${g.bootstrap.buildDir}/.bootstrap/minibp/obj/a.out ${g.bootstrap.buildDir}/.bootstrap/minibp/obj/a.out || $
${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
default ${g.bootstrap.BinDir}/minibp default ${g.bootstrap.BinDir}/minibp
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Singleton: bootstrap # Singleton: bootstrap
# Factory: github.com/google/blueprint/bootstrap.newSingletonFactory.func1 # Factory: github.com/google/blueprint/bootstrap.newSingletonFactory.func1
rule s.bootstrap.primarybp build ${g.bootstrap.buildDir}/.bootstrap/build.ninja: g.bootstrap.build.ninja $
command = ${g.bootstrap.BinDir}/minibp --build-primary ${runTests} -b ${g.bootstrap.buildDir} -d ${outfile}.d -o ${outfile} ${in} ${g.bootstrap.srcDir}/Android.bp | ${builder}
depfile = ${outfile}.d builder = ${g.bootstrap.BinDir}/minibp
description = minibp ${outfile} extra = --build-primary -t
rule s.bootstrap.minibp
command = ${g.bootstrap.BinDir}/minibp ${runTests} -b ${g.bootstrap.buildDir} -d ${out}.d -o ${out} ${in}
depfile = ${out}.d
description = minibp ${out}
restat = true
build ${g.bootstrap.buildDir}/.bootstrap/build.ninja: s.bootstrap.primarybp $
${g.bootstrap.srcDir}/Android.bp | ${g.bootstrap.BinDir}/gotestmain $
${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 $
${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/test/github.com/google/blueprint/proptools.a
outfile = ${g.bootstrap.buildDir}/.bootstrap/build.ninja
runTests = -t
default ${g.bootstrap.buildDir}/.bootstrap/build.ninja default ${g.bootstrap.buildDir}/.bootstrap/build.ninja
build ${g.bootstrap.buildDir}/.minibootstrap/build.ninja.in: $ build ${g.bootstrap.buildDir}/.minibootstrap/build.ninja.in: $
s.bootstrap.minibp ${g.bootstrap.srcDir}/Android.bp | $ g.bootstrap.build.ninja ${g.bootstrap.srcDir}/Android.bp | ${builder}
${g.bootstrap.BinDir}/minibp builder = ${g.bootstrap.BinDir}/minibp
runTests = -t extra = -t
default ${g.bootstrap.buildDir}/.minibootstrap/build.ninja.in default ${g.bootstrap.buildDir}/.minibootstrap/build.ninja.in
build ${g.bootstrap.buildDir}/.minibootstrap/build.ninja: $ build ${g.bootstrap.buildDir}/.minibootstrap/build.ninja: $