diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-06-19 02:16:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-19 02:16:37 +0000 |
| commit | b9c49ea2309a5100cf8ebf2b35a9cdb5cc4445fe (patch) | |
| tree | 3c19220e987f51b805c9c269a6e60c147ddf7f12 | |
| parent | c4dfcdcf0eef5c401e942c7605f80c6d6bb10a45 (diff) | |
| parent | fe42c0184d3a0bef34d112e021dc7dda7799d1ee (diff) | |
| download | android_external_bouncycastle-b9c49ea2309a5100cf8ebf2b35a9cdb5cc4445fe.tar.gz android_external_bouncycastle-b9c49ea2309a5100cf8ebf2b35a9cdb5cc4445fe.tar.bz2 android_external_bouncycastle-b9c49ea2309a5100cf8ebf2b35a9cdb5cc4445fe.zip | |
am fe42c018: am 0ad83c12: Merge "Switch from core to core-libart"
* commit 'fe42c0184d3a0bef34d112e021dc7dda7799d1ee':
Switch from core to core-libart
| -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) |