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

Merge "Fix the issue "\n" didn't get interpreted properly."

Browse Source 
am: 2c13abc95e

Change-Id: I8c0dbf8147007d39ba36f711885d4e25b2c83b70
This commit is contained in:
Nan Zhang
2017-05-17 00:35:27 +00:00
committed by android-build-merger
parent 6cd2b46177 2c13abc95e
commit cd2338ec78
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/defs.go
View File

@@ -80,9 +80,12 @@ var (
Description: "concatenate licenses $out", Description: "concatenate licenses $out",
}) })
// ubuntu 14.04 offcially use dash for /bin/sh, and its builtin echo command
// doesn't support -e option. Therefore we force to use /bin/bash when writing out
// content to file.
WriteFile = pctx.AndroidStaticRule("WriteFile", WriteFile = pctx.AndroidStaticRule("WriteFile",
blueprint.RuleParams{ blueprint.RuleParams{
Command: "echo '$content' > $out", Command: "/bin/bash -c 'echo -e $$0 > $out' '$content'",
Description: "writing file $out", Description: "writing file $out",
}, },
"content") "content")

2
python/builder.go
View File

@@ -82,7 +82,7 @@ func registerBuildActionForModuleFileList(ctx android.ModuleContext,
Output: fileList, Output: fileList,
Implicits: files, Implicits: files,
Args: map[string]string{ Args: map[string]string{
"content": strings.Join(content, "\n"), "content": strings.Join(content, `\n`),
}, },
}) })