StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to new blueprint api for bootstrap.BinDir

Browse Source 
And regenerate build.ninja.in

Change-Id: I35e8b0362799f94b33309d3944b411de5dbcf40a
This commit is contained in:
Dan Willemsen
2015-07-15 14:34:02 -07:00
committed by Colin Cross
parent ff93bddda3
commit 24f2f8df87
4 changed files with 227 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/builder.go
View File

@@ -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")
})