commit 1b291c13f4afa35b5452316280942e0de36e8562
author Kenny Root <kroot@google.com> Wed Jan 20 15:50:55 2016 -0800
committer Kenny Root <kroot@google.com> Wed Jan 20 15:50:57 2016 -0800
tree 1103ebebdfe4f1fd482d0df38caa231d769048f2
parent 69704608f4801a1362a28b37962f560d834da3da

Stop using AlgNameMapper

AlgNameMapper currently doesn't work after the transition to it being in
Conscrypt, so just get rid of it altogether.

Change-Id: I0e8b057915edcb584bd4470c43f3458efa49329e

Android.mk

diff --git a/Android.mk b/Android.mk
index 7043ad4..500a572 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common ims-common
+LOCAL_JAVA_LIBRARIES := bouncycastle core-oj telephony-common ims-common
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305
 
 LOCAL_MODULE_TAGS := optional