aboutsummaryrefslogtreecommitdiffstats
path: root/build.ninja.in
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2015-04-28 13:28:51 -0700
committerColin Cross <ccross@android.com>2015-04-29 14:59:07 -0700
commit0607cf7daa908bc5a9299bd761fdd3cd2a59191a (patch)
treec4a3b5c29fdbd2eddffc459a915d8ffd1b44ccc1 /build.ninja.in
parentd350ecd1023ca0352c71d866b3ab4e5de62e8506 (diff)
downloadbuild_soong-0607cf7daa908bc5a9299bd761fdd3cd2a59191a.tar.gz
build_soong-0607cf7daa908bc5a9299bd761fdd3cd2a59191a.tar.bz2
build_soong-0607cf7daa908bc5a9299bd761fdd3cd2a59191a.zip
java: add genrule support to java builds
Add support for source files generated by genrule or gensrcs to java builds. Change-Id: I39762b2ab65fa4cf92724300edc4ba995845ce92
Diffstat (limited to 'build.ninja.in')
-rw-r--r--build.ninja.in9
1 files changed, 5 insertions, 4 deletions
diff --git a/build.ninja.in b/build.ninja.in
index a46053f0..74845187 100644
--- a/build.ninja.in
+++ b/build.ninja.in
@@ -53,7 +53,7 @@ rule g.bootstrap.link
# Variant:
# Type: bootstrap_go_binary
# Factory: github.com/google/blueprint/bootstrap.newGoBinaryModule
-# Defined: build/soong/Blueprints:159:1
+# Defined: build/soong/Blueprints:160:1
build .bootstrap/androidmk/obj/androidmk.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/soong/androidmk/cmd/androidmk/android.go $
@@ -79,7 +79,7 @@ default .bootstrap/bin/androidmk
# Variant:
# Type: bootstrap_go_package
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule
-# Defined: build/soong/Blueprints:172:1
+# Defined: build/soong/Blueprints:173:1
build .bootstrap/androidmk-parser/pkg/android/soong/androidmk/parser.a: $
g.bootstrap.gc $
@@ -439,8 +439,9 @@ build .bootstrap/soong-java/pkg/android/soong/java.a: g.bootstrap.gc $
.bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a $
.bootstrap/soong-env/pkg/android/soong/env.a $
.bootstrap/soong-glob/pkg/android/soong/glob.a $
- .bootstrap/soong-common/pkg/android/soong/common.a
- incFlags = -I .bootstrap/blueprint-parser/pkg -I .bootstrap/blueprint-pathtools/pkg -I .bootstrap/blueprint-proptools/pkg -I .bootstrap/blueprint/pkg -I .bootstrap/blueprint-deptools/pkg -I .bootstrap/blueprint-bootstrap/pkg -I .bootstrap/soong-env/pkg -I .bootstrap/soong-glob/pkg -I .bootstrap/soong-common/pkg
+ .bootstrap/soong-common/pkg/android/soong/common.a $
+ .bootstrap/soong-genrule/pkg/android/soong/genrule.a
+ incFlags = -I .bootstrap/blueprint-parser/pkg -I .bootstrap/blueprint-pathtools/pkg -I .bootstrap/blueprint-proptools/pkg -I .bootstrap/blueprint/pkg -I .bootstrap/blueprint-deptools/pkg -I .bootstrap/blueprint-bootstrap/pkg -I .bootstrap/soong-env/pkg -I .bootstrap/soong-glob/pkg -I .bootstrap/soong-common/pkg -I .bootstrap/soong-genrule/pkg
pkgPath = android/soong/java
default .bootstrap/soong-java/pkg/android/soong/java.a