diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-05-26 15:13:03 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-05-31 18:31:56 -0700 |
| commit | c2aa4a9c52426e3cb9b14788096a817c85ea17aa (patch) | |
| tree | 2ff01c10e3b5b920810c2db3df6e11eb864c3407 /java | |
| parent | 17f052647f5e4afcb3f5c4142d9a2ccec627faab (diff) | |
| download | build_soong-c2aa4a9c52426e3cb9b14788096a817c85ea17aa.tar.gz build_soong-c2aa4a9c52426e3cb9b14788096a817c85ea17aa.tar.bz2 build_soong-c2aa4a9c52426e3cb9b14788096a817c85ea17aa.zip | |
Start using blueprint_go_binary
And install the tools into a more obvious location. soong_env is not
moved, since we need it to exist early, so that we can use it in
soong.bash in case there's a build failure.
Change-Id: I9bd1fa320d84d180b2cf3deb90782d380666f7a6
Diffstat (limited to 'java')
| -rw-r--r-- | java/builder.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/builder.go b/java/builder.go index 5269893e..d41abc18 100644 --- a/java/builder.go +++ b/java/builder.go @@ -90,7 +90,7 @@ 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.ToolDir}", "soong_jar")) pctx.HostBinToolVariable("dxCmd", "dx") pctx.HostJavaToolVariable("jarjarCmd", "jarjar.jar") } |