Merge "Split filepaths on ' ' in metadata generator" into main am: c35ca4de22
am: 2a4fb8417e
am: 1614601d09
Original change: https://android-review.googlesource.com/c/platform/build/+/2840735 Change-Id: I6424a49608fb5f80e472ea161f0206c645a25409 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -153,7 +153,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
inputFileData := strings.TrimRight(readFileToString(*inputFile), "\n")
|
inputFileData := strings.TrimRight(readFileToString(*inputFile), "\n")
|
||||||
filePaths := strings.Split(inputFileData, "\n")
|
filePaths := strings.Split(inputFileData, " ")
|
||||||
if len(filePaths) == 1 && filePaths[0] == "" {
|
if len(filePaths) == 1 && filePaths[0] == "" {
|
||||||
writeNewlineToOutputFile(*outputFile)
|
writeNewlineToOutputFile(*outputFile)
|
||||||
return
|
return
|
||||||
|
3
tools/metadata/testdata/inputFiles.txt
vendored
3
tools/metadata/testdata/inputFiles.txt
vendored
@@ -1,2 +1 @@
|
|||||||
file1.txt
|
file1.txt file2.txt
|
||||||
file2.txt
|
|
@@ -1,2 +1 @@
|
|||||||
file3.txt
|
file3.txt file4.txt
|
||||||
file4.txt
|
|
Reference in New Issue
Block a user