summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* am 918e3ef8: Merge "Track change to JSSE"Kenny Root2013-04-301-1/+1
|\
| * Track change to JSSEKenny Root2013-04-301-1/+1
* | am ba6f0e89: Merge "Track change to JSSE provider"Kenny Root2013-04-291-2/+3
|\|
| * Track change to JSSE providerKenny Root2013-04-291-2/+3
* | am 7d18f46a: Merge "Make bouncycastle-nojarjar static to keep it off the device"Brian Carlstrom2013-04-031-1/+1
|\|
| * Make bouncycastle-nojarjar static to keep it off the deviceBrian Carlstrom2013-04-031-1/+1
* | resolved conflicts for merge of bc044035 to jb-mr2-dev-plus-aospBrian Carlstrom2013-04-031-0/+11
|\|
| * Add bouncycastle-nojarjar for building okhttp-testsBrian Carlstrom2013-04-031-0/+15
* | am b61009d9: Merge "Simplify makefile."Elliott Hughes2012-12-051-2/+0
|\|
| * Simplify makefile.Elliott Hughes2012-12-041-2/+0
* | Allow CipherTest to run on RIBrian Carlstrom2012-09-281-1/+8
|/
* Make existing bouncycastle bcprov build on host and add host-only bcpkix buildBrian Carlstrom2012-09-191-3/+29
* jarjar org.bouncycastle to com.android.org.bouncycastleBrian Carlstrom2011-01-241-0/+2
* Add optional tags to bouncycastle modules.Jesse Wilson2010-09-161-0/+2
* make new module optionalJean-Baptiste Queru2010-09-141-0/+1
* Make bouncycastle available to the host build.Jesse Wilson2010-09-131-1/+15
* Remove libcore's dependency on bouncycastleBrian Carlstrom2010-06-251-3/+3
* Upgrade bouncycastle from 1.34 to 1.45Brian Carlstrom2010-06-211-0/+1
* Enable UTF-8 in libcore bouncycastle sourceBrian Carlstrom2010-06-181-0/+2
* Add phony target to run proguard on bouncycastle to find dead codeBrian Carlstrom2010-06-171-0/+60