From 7601ef600a2c349a7f4e8c49d70ad2585fa13668 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 20 Mar 2015 17:53:26 -0700 Subject: [PATCH] androidmk fixes for blueprint update Blueprint's internal Comment type changed, update androidmk to match. Change-Id: I7ce308cd5879734c1c76e19deef5b08aee377404 --- androidmk/cmd/androidmk/androidmk.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/androidmk/cmd/androidmk/androidmk.go b/androidmk/cmd/androidmk/androidmk.go index eca597eb5..daa5a0f21 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)