diff options
| author | Colin Cross <ccross@android.com> | 2015-06-30 16:27:57 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-06-30 17:51:25 -0700 |
| commit | b3245e9cf6452e799dddcec85ae46b6d8b8d1ea8 (patch) | |
| tree | dde09269bd1915eaa37a56c57e01bba11704b0d6 /build.ninja.in | |
| parent | 70a5f07663f00def2265056f2b008978248cb2b2 (diff) | |
| download | build_soong-b3245e9cf6452e799dddcec85ae46b6d8b8d1ea8.tar.gz build_soong-b3245e9cf6452e799dddcec85ae46b6d8b8d1ea8.tar.bz2 build_soong-b3245e9cf6452e799dddcec85ae46b6d8b8d1ea8.zip | |
androidbp: simplify translation by evaluating all expressions in Blueprint
Translation is getting complicated because the expressions supported
by Blueprint are difficult to support in Make. Modify androidbp
to use context aware parsing so it can evaluate all expressions at
parse time, so it only needs to deal with constant values.
Change-Id: I57047645fb48475baecd0361f78a93ec0a26011e
Diffstat (limited to 'build.ninja.in')
| -rw-r--r-- | build.ninja.in | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/build.ninja.in b/build.ninja.in index 8a507f2b..c015c641 100644 --- a/build.ninja.in +++ b/build.ninja.in @@ -70,8 +70,11 @@ build .bootstrap/androidbp/test/androidbp.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/build/soong/androidbp/cmd/soong.go $ ${g.bootstrap.srcDir}/build/soong/androidbp/cmd/androidbp_test.go | $ ${g.bootstrap.gcCmd} $ - .bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a - incFlags = -I .bootstrap/blueprint-parser/pkg + .bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $ + .bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $ + .bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $ + .bootstrap/blueprint/pkg/github.com/google/blueprint.a + incFlags = -I .bootstrap/blueprint-parser/pkg -I .bootstrap/blueprint-pathtools/pkg -I .bootstrap/blueprint-proptools/pkg -I .bootstrap/blueprint/pkg pkgPath = androidbp default .bootstrap/androidbp/test/androidbp.a @@ -90,7 +93,7 @@ default .bootstrap/androidbp/test/test.a build .bootstrap/androidbp/test/test: g.bootstrap.link $ .bootstrap/androidbp/test/test.a | ${g.bootstrap.linkCmd} - libDirFlags = -L .bootstrap/androidbp/test -L .bootstrap/blueprint-parser/pkg + libDirFlags = -L .bootstrap/androidbp/test -L .bootstrap/blueprint-parser/pkg -L .bootstrap/blueprint-pathtools/pkg -L .bootstrap/blueprint-proptools/pkg -L .bootstrap/blueprint/pkg default .bootstrap/androidbp/test/test build .bootstrap/androidbp/test/test.passed: g.bootstrap.test $ @@ -104,14 +107,17 @@ build .bootstrap/androidbp/obj/androidbp.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/build/soong/androidbp/cmd/soong.go | $ ${g.bootstrap.gcCmd} $ .bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $ - || .bootstrap/androidbp/test/test.passed - incFlags = -I .bootstrap/blueprint-parser/pkg + .bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $ + .bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $ + .bootstrap/blueprint/pkg/github.com/google/blueprint.a || $ + .bootstrap/androidbp/test/test.passed + incFlags = -I .bootstrap/blueprint-parser/pkg -I .bootstrap/blueprint-pathtools/pkg -I .bootstrap/blueprint-proptools/pkg -I .bootstrap/blueprint/pkg pkgPath = androidbp default .bootstrap/androidbp/obj/androidbp.a build .bootstrap/androidbp/obj/a.out: g.bootstrap.link $ .bootstrap/androidbp/obj/androidbp.a | ${g.bootstrap.linkCmd} - libDirFlags = -L .bootstrap/blueprint-parser/pkg + libDirFlags = -L .bootstrap/blueprint-parser/pkg -L .bootstrap/blueprint-pathtools/pkg -L .bootstrap/blueprint-proptools/pkg -L .bootstrap/blueprint/pkg default .bootstrap/androidbp/obj/a.out build .bootstrap/bin/androidbp: g.bootstrap.cp .bootstrap/androidbp/obj/a.out |