tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

902
build.ninja.in
View file

File diff suppressed because it is too large Load diff

8
common/defs.go
View file

@ -18,7 +18,7 @@ import (
"path/filepath"
"github.com/google/blueprint"
"github.com/google/blueprint/bootstrap"
_ "github.com/google/blueprint/bootstrap"
)
var (
@ -29,7 +29,7 @@ var (
srcDir = pctx.VariableConfigMethod("srcDir", Config.SrcDir)
androidbpCmd = filepath.Join(bootstrap.BinDir, "androidbp")
androidbpCmd = filepath.Join("${bootstrap.BinDir}", "androidbp")
androidbp = pctx.StaticRule("androidbp",
blueprint.RuleParams{
Command: androidbpCmd + " ${srcDir}/Android.bp $in $out",
@ -71,3 +71,7 @@ var (
},
"fromPath")
)
func init() {
pctx.Import("github.com/google/blueprint/bootstrap")
}

3
common/glob.go
View file

@ -19,7 +19,6 @@ import (
"path/filepath"
"github.com/google/blueprint"
"github.com/google/blueprint/bootstrap"
"android/soong/glob"
)
@ -40,7 +39,7 @@ import (
// in a build failure with a "missing and no known rule to make it" error.
var (
globCmd = filepath.Join(bootstrap.BinDir, "soong_glob")
globCmd = filepath.Join("${bootstrap.BinDir}", "soong_glob")
// globRule rule traverses directories to produce a list of files that match $glob
// and writes it to $out if it has changed, and writes the directories to $out.d

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