Parcourir la source

Fix the format of the merged provenance metadata textproto file.

Bug: 236316799
Test: m provenance_metadata
Change-Id: I43be0af2a98a6e41cf1738300f1b870e8e027a08
Wei Li il y a 1 an
Parent
commit
7eb7503c76
1 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 2 2
      provenance/provenance_singleton.go

+ 2 - 2
provenance/provenance_singleton.go

@@ -35,10 +35,10 @@ var (
 
 	mergeProvenanceMetaData = pctx.AndroidStaticRule("mergeProvenanceMetaData",
 		blueprint.RuleParams{
-			Command: `rm -rf $out $out.temp && ` +
+			Command: `rm -rf $out && ` +
 				`echo "# proto-file: build/soong/provenance/proto/provenance_metadata.proto" > $out && ` +
 				`echo "# proto-message: ProvenanceMetaDataList" >> $out && ` +
-				`touch $out.temp && cat $out.temp $in | grep -v "^#.*" >> $out && rm -rf $out.temp`,
+				`for file in $in; do echo '' >> $out; echo 'metadata {' | cat - $$file | grep -Ev "^#.*|^$$" >> $out; echo '}' >> $out; done`,
 		})
 )