Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8c2cee0 authored by Colin Cross's avatar Colin Cross
Browse files

Use merge_zips instead of ziptime for resetting timestamps in jacoco outputs 

ziptime doesn't support ZIP64 so it is limited to 65535 entries in
a zip file.  Use the newly added support in merge_zips to reset the
timestamp instead.

Bug: 308765940
Test: builds
Change-Id: I7bc4d8d4943e7417af1783a63ac5b5904d2aa751
parent fa24df6b

java/jacoco.go

+0 −2
Original line number Diff line number Diff line
@@ -34,13 +34,11 @@ var ( 
			`${config.Zip2ZipCmd} -i $in -o $strippedJar $stripSpec && ` +

			`${config.JavaCmd} ${config.JavaVmFlags} -jar ${config.JacocoCLIJar} ` +

			`  instrument --quiet --dest $tmpDir $strippedJar && ` +

			`${config.Ziptime} $tmpJar && ` +

			`${config.MergeZipsCmd} --ignore-duplicates -j $out $tmpJar $in`,

		CommandDeps: []string{

			"${config.Zip2ZipCmd}",

			"${config.JavaCmd}",

			"${config.JacocoCLIJar}",

			"${config.Ziptime}",

			"${config.MergeZipsCmd}",

		},

	},