Remove libcore's dependency on bouncycastle

external/bouncycastle
- Change to be the primary build for bouncycastle sources (as opposed to part of libcore)
- Moved OpenSSLMessageDigest from libcore to OpenSSLDigest
  It uses NativeCrypto API from core, but implements a bouncycastle specific interface
- restored registration of bouncycastle MessageDigests for SHA-1, SHA-256, MD5
  OpenSSLProvider versions take precedence, but explicit provider of "BC" allows choice
- enabled native versions of SHA-384 and SHA-512
- pruned MD4 implementation

frameworks/base
- frameworks and CoreTests modules now depend on bouncycastle
- update preloades classes for NativeBN package change
- moved CryptoTest to libcore

libcore
- core now builds without bouncycastle sources
- core-tests, core-tests-support, core-tests-supportlib now depend on bouncycastle
- removed libcore/openssl directory, moving NativeBN to java/math
- minor cleanup of Provider, Security, Services style while working on ProviderTest
- added new OpenSSLProvider registered as first provider to have
  priority over the others to ensure our native implementations are used
- moved BouncyCastle to have priority as a provider over Harmony
- JarVerifier and JarUtils now implicitly use OpenSSLMessageDigest
- Cleanedup OpenSSLSignature, implementation needs to be finished to move to OpenSSLProvider
- To avoid using PEMWriter from BouncyCastle, NativeCrypto now takes binary encoded certs and keys
  This is more efficient as well avoiding the base64 decode/encode of the binary data
- removed SHA-224 to match the RI

packages/apps/CertInstaller
- CertificateInstaller module now depends on bouncycastle
  this is the only app to depend on bouncycastle

system/core
- updated BOOTCLASSPATH

Change-Id: I42ac63a1669b03d0243f9714c89312227e48241d

1 files changed, 3 insertions, 3 deletions

diff --git a/Android.mk b/Android.mk
index 497465c..8f7e7ea 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,13 +15,13 @@
 #
 LOCAL_PATH := $(call my-dir)
 
-# This builds bouncycastle as a static library for running through proguard.
-# bouncycastle for the device itself is built from these sources by a libcore makefile.
 include $(CLEAR_VARS)
 LOCAL_MODULE := bouncycastle
 LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java)
 LOCAL_JAVACFLAGS := -encoding UTF-8
-include $(BUILD_STATIC_JAVA_LIBRARY)
+LOCAL_JAVA_LIBRARIES := core
+LOCAL_NO_STANDARD_LIBRARIES := true
+include $(BUILD_JAVA_LIBRARY)
 
 # Based on "Finding dead code" example in ProGuard manual at http://proguard.sourceforge.net/
 .PHONY: bouncycastle-proguard-deadcode