diff options
| author | Colin Cross <ccross@android.com> | 2015-03-20 17:53:26 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-03-20 17:54:09 -0700 |
| commit | 7601ef600a2c349a7f4e8c49d70ad2585fa13668 (patch) | |
| tree | 360b3a14eadc6cea7bdff2959bf578160a5956ca /androidmk | |
| parent | 62ec5f4eb32751c35cd0ea5852e73e0c4aa0a477 (diff) | |
| download | build_soong-7601ef600a2c349a7f4e8c49d70ad2585fa13668.tar.gz build_soong-7601ef600a2c349a7f4e8c49d70ad2585fa13668.tar.bz2 build_soong-7601ef600a2c349a7f4e8c49d70ad2585fa13668.zip | |
androidmk fixes for blueprint update
Blueprint's internal Comment type changed, update androidmk to
match.
Change-Id: I7ce308cd5879734c1c76e19deef5b08aee377404
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/androidmk.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/androidmk/cmd/androidmk/androidmk.go b/androidmk/cmd/androidmk/androidmk.go index eca597eb..daa5a0f2 100644 --- a/androidmk/cmd/androidmk/androidmk.go +++ b/androidmk/cmd/androidmk/androidmk.go @@ -31,14 +31,14 @@ func (f *bpFile) errorf(thing mkparser.MakeThing, s string, args ...interface{}) orig := thing.Dump() s = fmt.Sprintf(s, args...) f.comments = append(f.comments, bpparser.Comment{ - Comment: fmt.Sprintf("// ANDROIDMK TRANSLATION ERROR: %s", s), + Comment: []string{fmt.Sprintf("// ANDROIDMK TRANSLATION ERROR: %s", s)}, Pos: f.pos, }) lines := strings.Split(orig, "\n") for _, l := range lines { f.incPos() f.comments = append(f.comments, bpparser.Comment{ - Comment: "// " + l, + Comment: []string{"// " + l}, Pos: f.pos, }) } @@ -99,7 +99,7 @@ func main() { if comment, ok := t.AsComment(); ok { file.comments = append(file.comments, bpparser.Comment{ Pos: file.pos, - Comment: "//" + comment.Comment, + Comment: []string{"//" + comment.Comment}, }) } else if assignment, ok := t.AsAssignment(); ok { handleAssignment(file, assignment, cond) |