Update to new blueprint api for bootstrap.BinDir
And regenerate build.ninja.in
Change-Id: I35e8b0362799f94b33309d3944b411de5dbcf40a
diff --git a/java/builder.go b/java/builder.go
index d4b900d..4eda6adf 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -25,7 +25,7 @@
"android/soong/common"
"github.com/google/blueprint"
- "github.com/google/blueprint/bootstrap"
+ _ "github.com/google/blueprint/bootstrap"
)
var (
@@ -84,9 +84,10 @@
)
func init() {
+ pctx.Import("github.com/google/blueprint/bootstrap")
pctx.StaticVariable("commonJdkFlags", "-source 1.7 -target 1.7 -Xmaxerrs 9999999")
pctx.StaticVariable("javacCmd", "javac -J-Xmx1024M $commonJdkFlags")
- pctx.StaticVariable("jarCmd", filepath.Join(bootstrap.BinDir, "soong_jar"))
+ pctx.StaticVariable("jarCmd", filepath.Join("${bootstrap.BinDir}", "soong_jar"))
pctx.VariableFunc("dxCmd", func(c interface{}) (string, error) {
return c.(common.Config).HostBinTool("dx")
})