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 /common | |
| 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 'common')
| -rw-r--r-- | common/defs.go | 8 | ||||
| -rw-r--r-- | common/glob.go | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/common/defs.go b/common/defs.go index f5b02fe5..0001ce1b 100644 --- a/common/defs.go +++ b/common/defs.go @@ -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") +} diff --git a/common/glob.go b/common/glob.go index 5a01cf52..152be94e 100644 --- a/common/glob.go +++ b/common/glob.go @@ -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 |