diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-06-18 15:11:01 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-06-18 17:42:48 -0700 |
| commit | 314e0c854c1f2f5b9431dd9a879006b896093705 (patch) | |
| tree | 3c19220e987f51b805c9c269a6e60c147ddf7f12 | |
| parent | ffb23a4c8d70763aa29b048fbe43ac409db2d22d (diff) | |
| download | android_external_bouncycastle-314e0c854c1f2f5b9431dd9a879006b896093705.tar.gz android_external_bouncycastle-314e0c854c1f2f5b9431dd9a879006b896093705.tar.bz2 android_external_bouncycastle-314e0c854c1f2f5b9431dd9a879006b896093705.zip | |
Switch from core to core-libart
Bug: 14298175
Change-Id: I6003d2a3f9c5e254632e8a67bfee0c11ea0348f3
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -39,7 +39,7 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(android_bcprov_src_files) LOCAL_JAVACFLAGS := -encoding UTF-8 - LOCAL_JAVA_LIBRARIES := conscrypt core + LOCAL_JAVA_LIBRARIES := core-libart conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -51,7 +51,7 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(android_bcprov_src_files) LOCAL_JAVACFLAGS := -encoding UTF-8 - LOCAL_JAVA_LIBRARIES := conscrypt core + LOCAL_JAVA_LIBRARIES := core-libart conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) |