summaryrefslogtreecommitdiffstats
path: root/JavaLibrary.mk
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of afbed325 to jb-mr1-devElliott Hughes2012-08-281-0/+5
|\
| * Add dependencies on the makefiles.Elliott Hughes2012-08-281-0/+5
| * Fix build warning.Ying Wang2012-08-231-1/+1
* | Fix build warning.Ying Wang2012-08-231-1/+1
* | Remove obsolete variables.Ying Wang2012-08-221-8/+2
|/
* Remove junit source from libcore.Brett Chabot2012-04-161-21/+0
* Merge "Use external/mockwebserver in libcore"Jesse Wilson2011-06-071-2/+2
|\
| * Use external/mockwebserver in libcoreJesse Wilson2011-06-071-2/+2
* | Quote the filename before passing to jar.Ying Wang2011-06-061-2/+2
|/
* Remove --core-libraries from the core-tests make rules.Elliott Hughes2011-04-281-2/+0
* resolved conflicts for merge of cfa84a2a to dalvik-devBrian Carlstrom2011-03-241-1/+1
|\
| * Import SamplingProfiler from http://code.google.com/p/dalvik/Brian Carlstrom2011-03-241-1/+1
* | Move sqlite-jdbc to be a static libraryBrian Carlstrom2011-03-181-2/+4
* | resolved conflicts for merge of b5d9f82a to dalvik-devBrian Carlstrom2011-03-171-21/+0
|\ \ | |/
| * Remove sqlite-jdbc sources that moved to external/javasqliteBrian Carlstrom2011-03-171-11/+0
* | Remove unused core-junitrunnerBrian Carlstrom2011-03-071-13/+1
* | "m dalvik-host" for quick minimal host buildBrian Carlstrom2011-03-061-0/+36
* | Removing cts dependency on AllTests for running core-testsBrian Carlstrom2011-03-021-119/+5
* | Build everything with -encoding UTF-8, as we intended.Elliott Hughes2011-02-221-0/+11
|/
* Move apache-xml to external. (project 2 of 4)Jesse Wilson2011-01-131-1/+1
* Break dependency from libcore to Apache XML libraries.Jesse Wilson2011-01-091-1/+1
* Add libcore-docs targetBrian Carlstrom2011-01-051-0/+42
* Building libcore in master is spam city. Fix that.Elliott Hughes2010-12-141-2/+5
* Remove dead scripts.Elliott Hughes2010-10-111-19/+0
* Add optional tags to libcore.Jesse Wilson2010-09-161-2/+4
* make new module optionalJean-Baptiste Queru2010-09-141-0/+1
* Update the host core.jar build to include classes.dex.Jesse Wilson2010-09-131-6/+8
* New Java-based SamplingProfilerBrian Carlstrom2010-09-011-1/+12
* Remove libcore's dependency on bouncycastleBrian Carlstrom2010-06-261-3/+4
* Enable UTF-8 in libcore Java sourceBrian Carlstrom2010-06-181-0/+1
* libcore/luni/src/main/java/org/bouncycastle moved to external/bouncycastle/sr...Brian Carlstrom2010-06-171-1/+1
* am 83244e5b: update emma build path due to libcore location changeGuang Zhu2010-06-131-2/+6
|\
| * update emma build path due to libcore location changeGuang Zhu2010-06-111-2/+6
* | Adding HTTPS and proxy support to our mock webserver.Jesse Wilson2010-06-101-0/+11
|/
* Rename core-tests-luni to core-tests-luni for cts dependencyBrian Carlstrom2010-05-281-1/+1
* Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-masterBrian Carlstrom2010-05-281-235/+27
|\
| * Moving junit out of core.jar and into core-junit.jar.Jesse Wilson2010-05-171-5/+25
| * Merge awt-kernel, icu, luni-kernel, prefs, security-kernel, x-net into luniPeter Hallam2010-05-041-34/+1
| * Adapt to new location of libcoreJean-Baptiste Queru2010-04-301-1/+1
| * merge more modules into luniPeter Hallam2010-04-271-134/+3
| * More merging of nio into luniPeter Hallam2010-04-231-12/+1
| * am 7e3d5fcd: Merge "include emma into core library on conditional flag"Guang Zhu2010-04-201-0/+5
| |\
| * | Merge LocaleData and Resources, rename Resources to ICU.Elliott Hughes2010-04-161-11/+0
| * | Break the sqlite JDBC driver out from our JDBC implementation.Elliott Hughes2010-02-261-10/+29
| * | Fix a stupid mistake in my earlier change.Elliott Hughes2010-02-221-7/+5
| * | 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
| |\ \
| * | | Resync a load of tests with upstream, make our build faster.Elliott Hughes2010-02-191-25/+228
* | | | DO NOT MERGE: Split test targets into different .jars for master.Jesse Wilson2010-05-121-30/+298
* | | | Moving junit out of core.jar and into core-junit.jar.Jesse Wilson2010-05-041-5/+18