summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am fb93a769: Merge "bouncycastle: upgrade to version 1.52"Sergio Giro2015-04-21105-2648/+3941
|\ | | | | | | | | * commit 'fb93a7697b35e8a059d93e3d1776bc307981fc0e': bouncycastle: upgrade to version 1.52
| * Merge "bouncycastle: upgrade to version 1.52"Sergio Giro2015-04-21105-2648/+3941
| |\
| | * bouncycastle: upgrade to version 1.52Sergio Giro2015-04-20105-2648/+3941
| |/ | | | | | | Change-Id: I227db8e458e67af46ccb1c07bfca77a733f25979
* | am b44aff7a: Merge "Remove -encoding UTF-8, it is now the default"Colin Cross2015-03-311-6/+0
|\| | | | | | | | | * commit 'b44aff7a3b88138f0070630d467c7527cd90c2f3': Remove -encoding UTF-8, it is now the default
| * Merge "Remove -encoding UTF-8, it is now the default"Colin Cross2015-03-311-6/+0
| |\
| | * Remove -encoding UTF-8, it is now the defaultColin Cross2015-03-301-6/+0
| |/ | | | | | | Change-Id: I29b98f58280168eb4469c223fd12a4314cd6f852
* | am 75c09416: am 25324b6b: Merge "Build bouncycastle-hostdex only on linux ↵Narayan Kamath2015-01-071-2/+4
|\| | | | | | | | | | | | | hosts." * commit '75c094164ecc6ffaecd985b06edd60562fbf084b': Build bouncycastle-hostdex only on linux hosts.
| * am 25324b6b: Merge "Build bouncycastle-hostdex only on linux hosts."Narayan Kamath2015-01-071-2/+4
| |\ | | | | | | | | | | | | * commit '25324b6b2c70b3282cc11eef96b6cb33d5cfeee8': Build bouncycastle-hostdex only on linux hosts.
| | * Merge "Build bouncycastle-hostdex only on linux hosts."Narayan Kamath2015-01-071-2/+4
| | |\
| | | * Build bouncycastle-hostdex only on linux hosts.Narayan Kamath2015-01-061-2/+4
| | |/ | | | | | | | | | | | | | | | conscrypt is only buildable on linux and is a dependency. Change-Id: If383eeab3c6dab95772c9a0fc46da9eabed3cd68
* | | am 66020afc: am 2a64eecc: Avoid things that cause CertBlacklist to be ↵Kenny Root2014-11-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | preinitialized * commit '66020afc08ec1a477d2efa133dcd59cde3978a1b': Avoid things that cause CertBlacklist to be preinitialized
| * | am 2a64eecc: Avoid things that cause CertBlacklist to be preinitializedKenny Root2014-11-060-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '2a64eecc02ffb5b991fb5c367eab777b1325eef8': Avoid things that cause CertBlacklist to be preinitialized
| | * | Avoid things that cause CertBlacklist to be preinitializedKenny Root2014-11-053-25/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the CertBlacklist instance to a NoPreloadHolder, then move the System.getenv call in CertBlacklist to a constructor so it's not called during class initialization. (cherry picked from commit 7a21b9a68f2c90bdde986a98a55816d0cf3ea73e) Bug: 18013422 Change-Id: I39d0f43f948dec243d2d7cb79726d0642638b77a
* | | | am 82a68225: am bd63be61: am 9454cc5f: Merge "Avoid things that cause ↵Kenny Root2014-10-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | CertBlacklist to be preinitialized" * commit '82a68225c2cff851803e189e14fba050d98e78f9':
| * | | am bd63be61: am 9454cc5f: Merge "Avoid things that cause CertBlacklist to be ↵Kenny Root2014-10-250-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | preinitialized" * commit 'bd63be61caf85120ee69cda508a35580a230d57c':
| | * | am 9454cc5f: Merge "Avoid things that cause CertBlacklist to be preinitialized"Kenny Root2014-10-173-26/+30
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '9454cc5f373b734695c29d079d62003b7de763df': Avoid things that cause CertBlacklist to be preinitialized
* | | | | am c0144d74: am 4b898d5f: am 0ced44f2: Merge "Revert "Put the CertBlacklist ↵Kenny Root2014-10-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | in a NoPreloadHolder"" * commit 'c0144d74606fbaa25f4f5a9a3a66deaf232bd418':
| * | | | am 4b898d5f: am 0ced44f2: Merge "Revert "Put the CertBlacklist in a ↵Kenny Root2014-10-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | NoPreloadHolder"" * commit '4b898d5f5daafae7f3eae2951da07a9c1c608887':
| | * | | am 0ced44f2: Merge "Revert "Put the CertBlacklist in a NoPreloadHolder""Kenny Root2014-10-172-14/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ced44f2869c61a7f2ba20c115416582b2740be5': Revert "Put the CertBlacklist in a NoPreloadHolder"
* | | | | | am 312be539: am b000361b: am 74e779b0: Merge "Put the CertBlacklist in a ↵Kenny Root2014-10-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NoPreloadHolder" * commit '312be53972dcae0167dabdd548bccfabe3ff1189':
| * | | | | am b000361b: am 74e779b0: Merge "Put the CertBlacklist in a NoPreloadHolder"Kenny Root2014-10-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | * commit 'b000361bb7f237a66450ed7eef49a2e8727b058e':
| | * | | | am 74e779b0: Merge "Put the CertBlacklist in a NoPreloadHolder"Kenny Root2014-10-172-10/+14
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '74e779b0f5b26a0d31f08ad6ec0f8822501c4c16': Put the CertBlacklist in a NoPreloadHolder
* | | | | | | am 0fd6b0bb: am 9454cc5f: Merge "Avoid things that cause CertBlacklist to be ↵Kenny Root2014-10-173-26/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preinitialized" * commit '0fd6b0bbeca663abb584bc9883fd26a31cc1b113': Avoid things that cause CertBlacklist to be preinitialized
| * | | | | | am 9454cc5f: Merge "Avoid things that cause CertBlacklist to be preinitialized"Kenny Root2014-10-173-26/+30
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit '9454cc5f373b734695c29d079d62003b7de763df': Avoid things that cause CertBlacklist to be preinitialized
| | * | | | | Merge "Avoid things that cause CertBlacklist to be preinitialized"Kenny Root2014-10-173-26/+30
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Avoid things that cause CertBlacklist to be preinitializedKenny Root2014-10-173-26/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the CertBlacklist instance to a NoPreloadHolder, then move the System.getenv call in CertBlacklist to a constructor so it's not called during class initialization. Bug: 18013422 Change-Id: I39d0f43f948dec243d2d7cb79726d0642638b77a
* | | | | | | am 482d26ec: am 0ced44f2: Merge "Revert "Put the CertBlacklist in a ↵Kenny Root2014-10-172-14/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NoPreloadHolder"" * commit '482d26ec7ddb15a524b511cfe9a498bd55621aa8': Revert "Put the CertBlacklist in a NoPreloadHolder"
| * | | | | | am 0ced44f2: Merge "Revert "Put the CertBlacklist in a NoPreloadHolder""Kenny Root2014-10-172-14/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ced44f2869c61a7f2ba20c115416582b2740be5': Revert "Put the CertBlacklist in a NoPreloadHolder"
| | * | | | | Merge "Revert "Put the CertBlacklist in a NoPreloadHolder""Kenny Root2014-10-172-14/+10
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Revert "Put the CertBlacklist in a NoPreloadHolder"Kenny Root2014-10-172-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 883cbdac21af9885e6a349077168902c50ef2897. Change-Id: I6ed9d6d232dab6acc20d73643fbfddaae84f9020
* | | | | | | am 4d35838c: am 74e779b0: Merge "Put the CertBlacklist in a NoPreloadHolder"Kenny Root2014-10-172-10/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4d35838c1ff34d80158a59ec8887747d32e9702b': Put the CertBlacklist in a NoPreloadHolder
| * | | | | | am 74e779b0: Merge "Put the CertBlacklist in a NoPreloadHolder"Kenny Root2014-10-172-10/+14
| |\| | | | | | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '74e779b0f5b26a0d31f08ad6ec0f8822501c4c16': Put the CertBlacklist in a NoPreloadHolder
| | * | | | Merge "Put the CertBlacklist in a NoPreloadHolder"Kenny Root2014-10-172-10/+14
| | |\| | | | | | |/ / | | |/| |
| | | * | Put the CertBlacklist in a NoPreloadHolderKenny Root2014-10-162-10/+14
| | |/ / | | | | | | | | | | | | | | | | Bug: 18013422 Change-Id: I8d9d5bf2ab3e0a1231f86250e6c4cf47f3d415ca
* | | | am 9c4a275f: am e46fd725: Merge "Upgrade to 1.51"Kenny Root2014-08-07287-6121/+21379
|\| | | | | | | | | | | | | | | | | | | * commit '9c4a275f619a103c2cb54a7b117acfc19611a853': Upgrade to 1.51
| * | | am e46fd725: Merge "Upgrade to 1.51"Kenny Root2014-08-07287-6121/+21379
| |\| | | | | | | | | | | | | | | | | | * commit 'e46fd72598d3efe6d22c689da50ec30e433cbb19': Upgrade to 1.51
| | * | Merge "Upgrade to 1.51"Kenny Root2014-08-06287-6121/+21379
| | |\ \
| | | * | Upgrade to 1.51Kenny Root2014-08-06287-6121/+21379
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | f98b02ab394044a3c237d2c7a2ee5ef65793e8e9 bcpkix-jdk15on-151.tar.gz 95e59ad2492598d729cfc559b480c3f172de5dc3 bcprov-jdk15on-151.tar.gz Bug: 16578237 Change-Id: Ie4a3cd01b52b504a1098b00b413f1418273a6ef2
* | | | am c426488f: am dac96417: am 492f13b0: am 234720eb: Merge "Adding unbundled ↵Brian Carlstrom2014-07-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | build target for bouncycastle" * commit 'c426488fcd51c16e8a54b256864d9530b1c64e87':
| * | | am dac96417: am 492f13b0: am 234720eb: Merge "Adding unbundled build target ↵Brian Carlstrom2014-07-140-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | for bouncycastle" * commit 'dac964172756e29cbcfc8636a4722967decbea55':
* | | | am 71dbae7d: am 81870f19: Adding unbundled build target for bouncycastleJerome Poichet2014-07-140-0/+0
|\| | | | | | | | | | | | | | | * commit '71dbae7dceb34aa7f0477bb573c0f60db5b9eae5':
| * | | am 81870f19: Adding unbundled build target for bouncycastleJerome Poichet2014-07-140-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '81870f19b44030096dd613379a152c4406c65cb3': Adding unbundled build target for bouncycastle
* | | | | am b148ef40: am 234720eb: Merge "Adding unbundled build target for bouncycastle"Brian Carlstrom2014-07-140-0/+0
|\| | | | | |_|/ / |/| | | | | | | * commit 'b148ef4002e32401254a413a7c32b3e91b74ffed':
| * | | am 234720eb: Merge "Adding unbundled build target for bouncycastle"Brian Carlstrom2014-07-141-0/+10
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '234720ebe66540a53cff98b2448dddbc884bd09f': Adding unbundled build target for bouncycastle
* | | | am 492f13b0: am 234720eb: Merge "Adding unbundled build target for bouncycastle"staging/cm-12.0-cafstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.0Brian Carlstrom2014-07-100-0/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * commit '492f13b096cd62198a801c603bb8c231c06c1b8e': Adding unbundled build target for bouncycastle
| * | | am 234720eb: Merge "Adding unbundled build target for bouncycastle"Brian Carlstrom2014-07-101-0/+10
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '234720ebe66540a53cff98b2448dddbc884bd09f': Adding unbundled build target for bouncycastle
| | * | Merge "Adding unbundled build target for bouncycastle"Brian Carlstrom2014-07-101-0/+10
| | |\ \
| | | * | Adding unbundled build target for bouncycastleJerome Poichet2014-07-091-0/+10
| | |/ / | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 81870f19b44030096dd613379a152c4406c65cb3) Change-Id: I2a974bb050fb50b94045d1aa39da8ebd8c0ccd52
* | | / Adding unbundled build target for bouncycastleJerome Poichet2014-07-091-0/+10
| |_|/ |/| | | | | | | | Change-Id: I35000ec43c7e708f4fd99ce96d336bfab8659d20
* | | am fe42c018: am 0ad83c12: Merge "Switch from core to core-libart"Brian Carlstrom2014-06-191-2/+2
|\| | | | | | | | | | | | | | * commit 'fe42c0184d3a0bef34d112e021dc7dda7799d1ee': Switch from core to core-libart
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 01:40:33 +0000