summaryrefslogtreecommitdiffstats
path: root/JavaLibrary.mk
Commit message (Expand)AuthorAgeFilesLines
* am d058512d: Merge "Split Conscrypt makefile out from libcore"Kenny Root2013-09-171-84/+0
|\
| * Split Conscrypt makefile out from libcoreKenny Root2013-09-161-84/+0
* | resolved conflicts for merge of e89c4900 to klp-dev-plus-aospKenny Root2013-08-301-1/+0
|\ \
| * | Move support library to a separate static libraryKenny Root2013-08-301-4/+18
* | | am 775e4d51: Merge "Move conscrypt out libjavacore and split tests"Kenny Root2013-08-301-8/+54
|\ \ \ | | |/ | |/|
| * | Move conscrypt out libjavacore and split testsKenny Root2013-08-301-8/+54
* | | am a0a63383: Merge "Revert "Revert "Change conscrypt-nojarjar to a static lib...Kenny Root2013-08-291-3/+3
|\ \ \ | |/ /
| * | Revert "Revert "Change conscrypt-nojarjar to a static library""Kenny Root2013-08-291-3/+3
* | | resolved conflicts for merge of 932cf368 to klp-dev-plus-aospBrian Carlstrom2013-08-291-3/+18
|\ \ \ | |/ /
| * | Move support library to a separate static libraryKenny Root2013-08-291-3/+18
* | | am 2f8af406: Merge "Revert "Change conscrypt-nojarjar to a static library""Kenny Root2013-08-291-3/+3
|\ \ \ | |/ /
| * | Revert "Change conscrypt-nojarjar to a static library"Kenny Root2013-08-291-3/+3
* | | am 7eb201b9: Merge "Change conscrypt-nojarjar to a static library"Kenny Root2013-08-281-3/+3
|\ \ \ | |/ /
| * | Change conscrypt-nojarjar to a static libraryKenny Root2013-08-281-3/+3
* | | am a534d500: Merge "create a separate lib for jsr166. Bug: 10390711"Brian Carlstrom2013-08-231-0/+13
|\ \ \ | |/ /
| * | create a separate lib for jsr166.Tsu Chiang Chuang2013-08-231-0/+13
* | | am b76fb72d: Merge "Temporarily don\'t place jsr166 tests in coretests."Elliott Hughes2013-08-191-1/+1
|\ \ \ | |/ /
| * | Temporarily don't place jsr166 tests in coretests.Ian Rogers2013-08-191-1/+1
* | | am 58e672ed: Merge "Added jsr166 tck tests as part of the libcore testsuite."Elliott Hughes2013-08-161-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Added jsr166 tck tests as part of the libcore testsuite.Calin Juravle2013-08-141-1/+1
| * Add make rule for dex.Tsu Chiang Chuang2013-07-241-0/+6
* | Add make rule for dex.Tsu Chiang Chuang2013-07-241-0/+6
* | Add core-libart.jar alongside core.jarBrian Carlstrom2013-06-251-21/+30
* | Adding libart support to libcoreBrian Carlstrom2013-05-221-0/+6
|/
* Move some files with dalvik dependencies to libdvmBrian Carlstrom2013-05-131-0/+1
* Move dex utilities from dalvik/dx to libcore/dex part 2Jesse Wilson2013-04-301-1/+1
* Move JSSE to new packageKenny Root2013-04-291-5/+56
* Merge "Move the external/apache-harmony/math tests into libcore."Elliott Hughes2013-04-061-1/+1
|\
| * Move the external/apache-harmony/math tests into libcore.Elliott Hughes2013-04-041-1/+1
* | Switch to OkHttp as URL's preferred HTTP implementation.jwilson2013-04-031-3/+3
|/
* Implement UTS #35 5-count date format patterns.Elliott Hughes2013-02-071-5/+5
* Track rename of mockwebserver-hostdex to mockwebserver-hostBrian Carlstrom2013-01-171-1/+1
* Add NIST PKIX tests to core-tests and knownfailuresKenny Root2013-01-171-2/+2
* am 44d48b2d: Merge "Improve the System.currentTimeMillis/Date/DateFormat/Simp...Elliott Hughes2012-11-081-1/+1
|\
| * Improve the System.currentTimeMillis/Date/DateFormat/SimpleDateFormat documen...Elliott Hughes2012-11-081-1/+1
* | am ca5c576d: Merge "Fix LIBCORE_SKIP_TESTS without causing warnings."Elliott Hughes2012-10-181-1/+4
|\ \ | |/
| * Fix LIBCORE_SKIP_TESTS without causing warnings.Elliott Hughes2012-10-181-1/+4
* | am f3a26410: Merge "Make libcore\'s dependency on the tzdata explicit."Elliott Hughes2012-10-181-0/+2
|\ \ | |/
| * Make libcore's dependency on the tzdata explicit.Elliott Hughes2012-10-181-0/+2
* | 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
|\