Merge "Metadata tool correction: Output empty proto in case of no input" into... (35c67b2d) · Commits · e / os / android_build

tools/metadata/generator.go

+19 −10

Original line number	Diff line number	Diff line
		@@ -77,9 +77,18 @@ func readFileToString(filePath string) string {
		return string(data)
		}

		func writeNewlineToOutputFile(outputFile string) {
		func writeEmptyOutputProto(outputFile string, metadataRule string) {
		file, err := os.Create(outputFile)
		data := "\n"
		if err != nil {
		log.Fatal(err)
		}
		var message proto.Message
		if metadataRule == "test_spec" {
		message = &test_spec_proto.TestSpec{}
		} else if metadataRule == "code_metadata" {
		message = &code_metadata_proto.CodeMetadata{}
		}
		data, err := proto.Marshal(message)
		if err != nil {
		log.Fatal(err)
		}
		@@ -235,7 +244,7 @@ func main() {
		inputFileData := strings.TrimRight(readFileToString(*inputFile), "\n")
		filePaths := strings.Split(inputFileData, " ")
		if len(filePaths) == 1 && filePaths[0] == "" {
		writeNewlineToOutputFile(*outputFile)
		writeEmptyOutputProto(outputFile, rule)
		return
		}
		ownershipMetadataMap := &sync.Map{}

+0 −1

Original line number	Diff line number	Diff line