Merge "Split filepaths on ' ' in metadata generator" into main am: c35ca4de22 am: 2a4fb8417e

Original change: https://android-review.googlesource.com/c/platform/build/+/2840735 Change-Id: Id3098b6c9bd2ec8dc3bd575e97f68ed899969ef0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 17:14:26 +00:00
parent f55c5b2b69 2a4fb8417e
commit 1614601d09
3 changed files with 3 additions and 5 deletions
--- a/tools/metadata/generator.go
+++ b/tools/metadata/generator.go
@@ -153,7 +153,7 @@ func main() {
 	}

 	inputFileData := strings.TrimRight(readFileToString(*inputFile), "\n")
-	filePaths := strings.Split(inputFileData, "\n")
+	filePaths := strings.Split(inputFileData, " ")
 	if len(filePaths) == 1 && filePaths[0] == "" {
 		writeNewlineToOutputFile(*outputFile)
 		return
--- a/tools/metadata/testdata/inputFiles.txt
+++ b/tools/metadata/testdata/inputFiles.txt
@@ -1,2 +1 @@
-file1.txt
-file2.txt
+file1.txt file2.txt
--- a/tools/metadata/testdata/inputFilesNegativeCase.txt
+++ b/tools/metadata/testdata/inputFilesNegativeCase.txt
@@ -1,2 +1 @@
-file3.txt
-file4.txt
+file3.txt file4.txt