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