Commit 9ba7a6ca authored by Colin Cross's avatar Colin Cross
Browse files

Merge remote-tracking branch 'aosp/upstream-master' into master

* e1502d10 Add build with JDK 10-ea
* dd7809ac Cleanup AgentTest (#618)
* 8f046096 Remove obsolete phase binding (#617)
* cdd0ec17 Fix test that doesn't pass bytecode verification of Eclipse OpenJ9 JVM
* 45223410 Use default environment in Travis instead of deprecated
* caa820ed Upgrade ASM to 6.0 (#600)
* ec6287a6 Add filter for methods annotated with @groovy.transform.Generated (#610)
* 88d7b01d Fix test to not require additional settings on JDK 9 (#611)
* bdfa45fe Add test of offline instrumentation of Java 9 module-info (#608)
* 11ac0663 Document contract for In/OutputStream resources and fix example (#605)
* 4d6ca957 Descriptive names for all tests in FrameSnapshotTest (#609)
* 99244757 Add test of ASM bug 317792 (#607)
* b060c251 Update links to ASM issues
* e094d693 Add test of ASM bug 317793 (#606)
* ac25a3f5 Apply naming convention and add missing tests
* b19911c2 Suppress compiler warning
* 1962cf59 Yak shaving: add ability to merge coverage of several instructions (#601)
* aca2da1d Show in StringSwitchTest that filter works for complex expressions (#599)
* 4109d66f Yak shaving: determine covered branches for each instruction (#598)
* 04f923c1 Add filter for bytecode that javac generates for String in switch (#596)
* 8cd32471 Happy birthday JDK 9!
* 8a2822d1 Describe correct agent option in MBeanClient example (#582)
* 4d08365f Add "--verbose" option to "classinfo" CLI command (#578)
* 424251f1 Fix build in Travis
* 90a1416c Fix build in Travis
* 4b471ef7 Remove duplicate line from the file header
* 4b7fd7cc Add link about integration of JaCoCo into Shippable (#579)
* 5a745a38 Fix assertions for JDK 8 >= u152 (#576)
* 765bf090 Remove unused SVN keyword "Id"
* fcf9baf8 Remove unused MAVEN_OPTS
* bb2ecb52 Add Artifact.SCOPE_PROVIDED artifacts to aggregate report (#572)
* 86856fef Use proper exception type in documentation (#557)
* 31575a30 For Java 9 add "Automatic-Module-Name" to manifests of JAR files (#565)
* 98a2a41e Relocate 3rd party libs in CLI nodeps JAR (#561)
* 63d375fd Fix build for JDK 9 >= b175 (#558)
* c85fd2a4 Update documentation about Maven artifacts (#540)
* 05a2aa7d Descriptor of jacoco-maven-plugin should include "help" mojo (#559)
* c10af135 Reduce chance of conflict with other agents (#555)
* 2a2f1619 Use dest argument as folder in any case (#543)
*   817d0ae1 Merge pull request #541 from jacoco/issue-541
|\
| * 1b959434 Add location to IOException when unable to read stream during analysis
|/
* 13f12d39 Add Command Line Interface (#525)
* 10f3ff0d ExecDumpClient should report error when no data is retrieved (#538)
* 938b0b4e Merge pull request #536 from mattnelson/percentages
* 129201d6 Update documentation for limit configuration as percent.
* c39e3d26 create reusable parseValue method for ratio limits
* d9caed9d Support limit ratios as percents

Bug: 69669951
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests
Change-Id: I484df66b7890b2b6d3d0d9401a60239a4a189260
parents 37043f9e e1502d10
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment