commit 7a318a6755e0065553919fd2185eaef6df960a5c
author Jerome Poichet <jpoichet@google.com> Mon Jul 07 14:09:16 2014 -0700
committer Jerome Poichet <jpoichet@google.com> Wed Jul 09 17:16:03 2014 -0700
tree c68b86da684c4564416c10509f51b18b42abd2b4
parent 22c862eaf3f88bb389c3b53b1f7a22415da7177e

Moving back to non platform bouncycastle

- Using unbundled bouncycastle
- Statically link against bouncycastle
- Not using platform bouncycastle

Change-Id: I8167032d898aedc272047e3f036a87d64091ce8d

Conflicts:
	Android.mk

Android.mk

diff --git a/Android.mk b/Android.mk
index 2f61136..bf14e9f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,9 +13,8 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_SDK_VERSION := current
 
-LOCAL_JAVA_LIBRARIES := \
-	bouncycastle \
-	conscrypt
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    bouncycastle-unbundled
 
 include $(BUILD_STATIC_JAVA_LIBRARY)