From 6abc973a9cced17f1b18daeae9b7144a2cf323e4 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 21 Dec 2017 14:11:13 -0800 Subject: [PATCH] Update jacoco command line flags for latest version jacoco_cli wants --quiet and --dest instead of -quiet and -dest. Bug: 69669951 Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests Change-Id: I72b3d0a21c5fa02a58914953d3d794065f59bd18 --- java/jacoco.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/jacoco.go b/java/jacoco.go index 59f2fd3af..e6da5a657 100644 --- a/java/jacoco.go +++ b/java/jacoco.go @@ -28,7 +28,8 @@ import ( var ( jacoco = pctx.AndroidStaticRule("jacoco", blueprint.RuleParams{ Command: `${config.Zip2ZipCmd} -i $in -o $strippedJar $stripSpec && ` + - `${config.JavaCmd} -jar ${config.JacocoCLIJar} instrument -quiet -dest $instrumentedJar $strippedJar && ` + + `${config.JavaCmd} -jar ${config.JacocoCLIJar} ` + + ` instrument --quiet --dest $instrumentedJar $strippedJar && ` + `${config.Ziptime} $instrumentedJar && ` + `${config.MergeZipsCmd} --ignore-duplicates -j $out $instrumentedJar $in`, CommandDeps: []string{