openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not "escape" newline if comment ends with ESC character. 

Fixes: 127521510
Test: manual
Change-Id: I88a8eb2ca94b8aa06e2682d2c14f9e74f5ada286
This commit is contained in:
Sasha Smundak 2019-03-05 17:34:32 -08:00
parent 7aa5a56bbc
commit e10952b442
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
androidmk/cmd/androidmk/androidmk_test.go
View File

@ -1062,6 +1062,17 @@ include test/vts/tools/build/Android.host_config.mk
vts_config { vts_config {
name: "vtsconf", name: "vtsconf",
} }
`,
},
{
desc: "comment with ESC",
in: `
# Comment line 1 \
# Comment line 2
`,
expected: `
// Comment line 1 \
// Comment line 2
`, `,
}, },
} }

8
androidmk/parser/parser.go
View File

@ -485,10 +485,12 @@ loop:
case '\\': case '\\':
p.parseEscape() p.parseEscape()
if p.tok == '\n' { if p.tok == '\n' {
comment += "\n" // Special case: '\' does not "escape" newline in comment (b/127521510)
} else { comment += "\\"
comment += "\\" + p.scanner.TokenText() p.accept(p.tok)
break loop
} }
comment += "\\" + p.scanner.TokenText()
p.accept(p.tok) p.accept(p.tok)
case '\n': case '\n':
p.accept('\n') p.accept('\n')