summaryrefslogtreecommitdiffstats
path: root/JavaLibrary.mk
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Resync a load of tests with upstream, make our build faster.Elliott Hughes2010-02-191-25/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I started off with a mission to remove uses of dalvik.annotation.* (stuff like @TestTargetNew and other useless junk that just makes it harder to stay in sync with upstream). I wrote a script to go through tests showing me the diff between what we have and what upstream has, thinking that in cases where upstream has also added tests, I may as well pull them in at the same time... ...but I didn't realize how close we were to having dx fill its 1.5GiB heap. After trying various alternatives, I decided to bite the bullet and break core-tests up into one .jar per module. This adds parallelism back into this, the slowest part of our build. (I can do even better, but I'll do that in a separate patch, preferably after we've merged recent changes from master.) Only a couple of dependencies were problematic: the worthless TestSuiteFactory which already contained a comment suggesting we get rid of it, and the fact that some tests -- most notably the concurrent ones -- also contained main methods that started the JUnit tty-based TestRunner. (In the long run, we want to be running the harmony tests directly from a pristine "svn co" of upstream, using DalvikRunner. But this will be a big help in the meantime, and starts the work of getting our current copy of the tests into a state where we can start to extract any meaningful changes/additions we've made.)
* | | | DO NOT MERGE: Split test targets into different .jars for master.Jesse Wilson2010-05-121-30/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cherry picks the critical parts of enh's original change: 7ee3a061452c5a7e5c8e661219a1f08a14171858 This is a stopgap fix; eventually when dalvik-dev's changes are committed to master this should be obsolete. Change-Id: Ieb04253fb7387ffa37452992c8a5af739fbbc45f
* | | | Moving junit out of core.jar and into core-junit.jar.Jesse Wilson2010-05-041-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it wasn't possible to start a dalvikvm without a copy of JUnit on the boot class path. Change-Id: I52f924207efe0a115e69616111807c6738d1a17f https://android-git.corp.google.com/g/#change,50609 https://android-git.corp.google.com/g/#change,50610 https://android-git.corp.google.com/g/#change,50611
* | | | no emma instrumentation on core-testGuang Zhu2010-04-281-0/+3
| |_|/ |/| | | | | | | | | | | | | | | | | | | | * applying emma instrumentation causes OOM in dx * test packages don't need emma instrumentation anyway, it's the package under test that needs to be processed by emma Change-Id: I8e65d3750aae716c52fb98d0b8cd41a748344516
* | | include emma into core library on conditional flagGuang Zhu2010-03-111-0/+5
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | emma library is used for collecting code coverage. Current pain point is that for collecting code coverage, developers either need to include emma as a local static library, or change BOOTCLASSPATH to include emma which includes hacking boot image and reflashing it. With this change, emma will be integrated into core.jar if EMMA_INSTRUMENT flag is on, so pushing the updated framework.jar and perform a runtime restart will make emma globally available to all code coverage tests. This change will only affect code coverage builds. Change-Id: I097254835ef4817d068e8946ecbec60135e1f515
* | Remove external/jsr305, external/guava, and external/caliper.Elliott Hughes2010-02-191-2/+2
|/
* Support running caliper with the jtreg runner. This is an early first look;Jesse Wilson2009-12-101-1/+1
| | | | we'll need to fix a few things before the UI for this is nice.
* Split libcore/Android.mk into two files, one for Java code and one forDan Bornstein2009-10-261-0/+184
native code, and make each have a set of rules for building on the host. I also tightened up how sub.mk processing works and documented it a little better. Change-Id: I8a7a4c5697b2f22c4d69941dba381d6452200911