diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-07-15 14:34:02 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-08-24 15:40:44 -0700 |
| commit | 24f2f8df874c5253c0772f1524c85fedaa7c64be (patch) | |
| tree | 0cbacf8928cd4a1c0fa68c911610d65ca831efe7 /java | |
| parent | ff93bddda3268edc4159aa2eea9d8d814727732f (diff) | |
| download | build_soong-24f2f8df874c5253c0772f1524c85fedaa7c64be.tar.gz build_soong-24f2f8df874c5253c0772f1524c85fedaa7c64be.tar.bz2 build_soong-24f2f8df874c5253c0772f1524c85fedaa7c64be.zip | |
Update to new blueprint api for bootstrap.BinDir
And regenerate build.ninja.in
Change-Id: I35e8b0362799f94b33309d3944b411de5dbcf40a
Diffstat (limited to 'java')
| -rw-r--r-- | java/builder.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/builder.go b/java/builder.go index d4b900d3..4eda6adf 100644 --- a/java/builder.go +++ b/java/builder.go @@ -25,7 +25,7 @@ import ( "android/soong/common" "github.com/google/blueprint" - "github.com/google/blueprint/bootstrap" + _ "github.com/google/blueprint/bootstrap" ) var ( @@ -84,9 +84,10 @@ var ( ) 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") }) |