commit	37043f9e86b8beb84e623729da2881091a43150c	[log] [tgz]
author	Colin Cross <ccross@android.com>	Wed Nov 22 09:06:27 2017 -0800
committer	Colin Cross <ccross@android.com>	Thu Dec 21 14:14:29 2017 -0800
tree	b78a7f4fad7b2d1b2989bf54e02694287dd4c35f
parent	d617066fb6048ef15f47f58a241fa8399845e831 [diff]

Revert "Merge remote-tracking branch 'aosp/upstream-pull-525' into master"

This reverts commit 369c1a464f4b750a0df7a750d5ab6bcc90202697, reversing
changes made to ce2d33f3145d39d9e9aa6e8b59d409f803a13955.

These changes are in upstream now, revert the manual merge to simplify
merging upstream.

Bug: 69669951
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests
Change-Id: I120abed4c5913abc948b81116225d3969c039549

README.android[diff]
jacoco/assembly.xml[diff]
jacoco/pom.xml[diff]
org.jacoco.build/pom.xml[diff]
org.jacoco.cli.test/.classpath[Deleted - diff]
org.jacoco.cli.test/.project[Deleted - diff]
org.jacoco.cli.test/about.html[Deleted - diff]
org.jacoco.cli.test/pom.xml[Deleted - diff]
org.jacoco.cli.test/src/org/jacoco/cli/internal/CommandTestBase.java[Deleted - diff]
org.jacoco.cli.test/src/org/jacoco/cli/internal/MainTest.java[Deleted - diff]
org.jacoco.cli.test/src/org/jacoco/cli/internal/XmlDocumentationTest.java[Deleted - diff]
org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ClassInfoTest.java[Deleted - diff]
org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/DumpTest.java[Deleted - diff]
org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ExecInfoTest.java[Deleted - diff]
org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/InstrumentTest.java[Deleted - diff]
org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/MergeTest.java[Deleted - diff]
org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ReportTest.java[Deleted - diff]
org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/VersionTest.java[Deleted - diff]
org.jacoco.cli/.classpath[Deleted - diff]
org.jacoco.cli/.project[Deleted - diff]
org.jacoco.cli/about.html[Deleted - diff]
org.jacoco.cli/pom.xml[Deleted - diff]
org.jacoco.cli/src/org/jacoco/cli/internal/Command.java[Deleted - diff]
org.jacoco.cli/src/org/jacoco/cli/internal/CommandHandler.java[Deleted - diff]
org.jacoco.cli/src/org/jacoco/cli/internal/CommandParser.java[Deleted - diff]
org.jacoco.cli/src/org/jacoco/cli/internal/Main.java[Deleted - diff]
org.jacoco.cli/src/org/jacoco/cli/internal/XmlDocumentation.java[Deleted - diff]
org.jacoco.cli/src/org/jacoco/cli/internal/commands/AllCommands.java[Deleted - diff]
org.jacoco.cli/src/org/jacoco/cli/internal/commands/ClassInfo.java[Deleted - diff]
org.jacoco.cli/src/org/jacoco/cli/internal/commands/Dump.java[Deleted - diff]
org.jacoco.cli/src/org/jacoco/cli/internal/commands/ExecInfo.java[Deleted - diff]
org.jacoco.cli/src/org/jacoco/cli/internal/commands/Instrument.java[Deleted - diff]
org.jacoco.cli/src/org/jacoco/cli/internal/commands/Merge.java[Deleted - diff]
org.jacoco.cli/src/org/jacoco/cli/internal/commands/Report.java[Deleted - diff]
org.jacoco.cli/src/org/jacoco/cli/internal/commands/Version.java[Deleted - diff]
org.jacoco.core.test/src/org/jacoco/core/tools/ExecDumpClientTest.java[diff]
org.jacoco.core/src/org/jacoco/core/tools/ExecDumpClient.java[diff]
org.jacoco.doc/docroot/doc/changes.html[diff]
org.jacoco.doc/docroot/doc/index.html[diff]
org.jacoco.doc/docroot/doc/integrations.html[diff]
org.jacoco.doc/docroot/index.html[diff]
org.jacoco.doc/pom.xml[diff]
org.jacoco.doc/xsl/cli.xsl[Deleted - diff]
org.jacoco.tests/pom.xml[diff]

44 files changed

tree: b78a7f4fad7b2d1b2989bf54e02694287dd4c35f

README.md

JaCoCo Java Code Coverage Library

JaCoCo is a free Java code coverage library distributed under the Eclipse Public License. Check the project homepage for downloads, documentation and feedback.

Please use our mailing list for questions regarding JaCoCo which are not already covered by the extensive documentation.

Note: We do not answer general questions in the project's issue tracker. Please use our mailing list for this.