StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Defer \n quoting generatedContents until creating the ninja rule"

Browse Source
This commit is contained in:
Treehugger Robot
2020-05-12 02:44:38 +00:00
committed by Gerrit Code Review
parent 432f75c61a 1110827b3f
commit 0a5dae117b
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/bp_test.go
View File

@@ -57,7 +57,7 @@ func TestTransformRemoveProperty(t *testing.T) {
contents := &generatedContents{} contents := &generatedContents{}
outputPropertySet(contents, set) outputPropertySet(contents, set)
helper.AssertTrimmedStringEquals("removing property failed", "name: \"name\",\\n", contents.content.String()) helper.AssertTrimmedStringEquals("removing property failed", "name: \"name\",\n", contents.content.String())
} }
func TestTransformRemovePropertySet(t *testing.T) { func TestTransformRemovePropertySet(t *testing.T) {
@@ -72,5 +72,5 @@ func TestTransformRemovePropertySet(t *testing.T) {
contents := &generatedContents{} contents := &generatedContents{}
outputPropertySet(contents, set) outputPropertySet(contents, set)
helper.AssertTrimmedStringEquals("removing property set failed", "name: \"name\",\\n", contents.content.String()) helper.AssertTrimmedStringEquals("removing property set failed", "name: \"name\",\n", contents.content.String())
} }

2
sdk/testing.go
View File

@@ -207,7 +207,7 @@ type testSdkResult struct {
// e.g. find the src/dest pairs from each cp command, the various zip files // e.g. find the src/dest pairs from each cp command, the various zip files
// generated, etc. // generated, etc.
func (r *testSdkResult) getSdkSnapshotBuildInfo(sdk *sdk) *snapshotBuildInfo { func (r *testSdkResult) getSdkSnapshotBuildInfo(sdk *sdk) *snapshotBuildInfo {
androidBpContents := strings.NewReplacer("\\n", "\n").Replace(sdk.GetAndroidBpContentsForTests()) androidBpContents := sdk.GetAndroidBpContentsForTests()
info := &snapshotBuildInfo{ info := &snapshotBuildInfo{
r: r, r: r,

17
sdk/update.go
View File

@@ -87,18 +87,23 @@ func (gc *generatedContents) Dedent() {
} }
func (gc *generatedContents) Printfln(format string, args ...interface{}) { func (gc *generatedContents) Printfln(format string, args ...interface{}) {
// ninja consumes newline characters in rspfile_content. Prevent it by fmt.Fprintf(&(gc.content), strings.Repeat(" ", gc.indentLevel)+format+"\n", args...)
// escaping the backslash in the newline character. The extra backslash
// is removed when the rspfile is written to the actual script file
fmt.Fprintf(&(gc.content), strings.Repeat(" ", gc.indentLevel)+format+"\\n", args...)
} }
func (gf *generatedFile) build(pctx android.PackageContext, ctx android.BuilderContext, implicits android.Paths) { func (gf *generatedFile) build(pctx android.PackageContext, ctx android.BuilderContext, implicits android.Paths) {
rb := android.NewRuleBuilder() rb := android.NewRuleBuilder()
// convert \\n to \n
content := gf.content.String()
// ninja consumes newline characters in rspfile_content. Prevent it by
// escaping the backslash in the newline character. The extra backslash
// is removed when the rspfile is written to the actual script file
content = strings.ReplaceAll(content, "\n", "\\n")
rb.Command(). rb.Command().
Implicits(implicits). Implicits(implicits).
Text("echo").Text(proptools.ShellEscape(gf.content.String())). Text("echo").Text(proptools.ShellEscape(content)).
// convert \\n to \n
Text("| sed 's/\\\\n/\\n/g' >").Output(gf.path) Text("| sed 's/\\\\n/\\n/g' >").Output(gf.path)
rb.Command(). rb.Command().
Text("chmod a+x").Output(gf.path) Text("chmod a+x").Output(gf.path)