summaryrefslogtreecommitdiffstats
path: root/JavaLibrary.mk
Commit message (Collapse)AuthorAgeFilesLines
* Break the sqlite JDBC driver out from our JDBC implementation.Elliott Hughes2010-02-261-10/+29
| | | | | | | | | | | | | | | | | | The JDBC driver is from a different source (http://www.ch-werner.de/javasqlite/overview-summary.html) and is only really needed for testing. Bug 2468870 asks that we don't eagerly register the native methods for these classes. That bug is fixed by this change. Bug 2198667 asks that we stop shipping this JDBC driver as part of the base system. That bug is not addressed by this change: the classes and native code are now in their own, separate, .jar and .so files -- so they'll be easier to remove in future -- but for now those files are still in /system/framework and /system/lib respectively. Bug: 2468870 Bug: 2198667
* Fix a stupid mistake in my earlier change.Elliott Hughes2010-02-221-7/+5
| | | | (I removed the unused parameter from the wrong macro!)
* Adapt jesse's new json tests to the new build scheme.Elliott Hughes2010-02-221-8/+33
|
* Merge remote branch 'goog/master' into mmElliott Hughes2010-02-221-21/+21
|\ | | | | | | | | Conflicts: libcore/JavaLibrary.mk
| * Remove external/jsr305, external/guava, and external/caliper.Elliott Hughes2010-02-191-2/+2
| |
* | 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.)
* 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