diff options
| author | Sergio Giro <sgiro@google.com> | 2016-02-01 14:28:33 +0000 |
|---|---|---|
| committer | Sergio Giro <sgiro@google.com> | 2016-02-01 14:28:33 +0000 |
| commit | 2b28a85478cd7c7cc30f338751cbcef79a603f26 (patch) | |
| tree | 69e38a2b9d6de22979262efb754e56cf8978b537 | |
| parent | 7cff056fde4e8c57fc17dad5f5df93f945d56ad0 (diff) | |
| download | bouncycastle-2b28a85478cd7c7cc30f338751cbcef79a603f26.tar.gz | |
Update elements in android tree as in aosp and goog ToT
Android tree as in goog
99cbec7970df89800c3592544c47fbd19430b764
and aosp
9b30eb05e5be69d51881a0d1b31e503e97acd784
git diff aosp/master goog/master --name-only
shows no differences except for bouncycastle sources
Change-Id: I631ce52c4fdd21780abe9858f9eb5ef31988f2dd
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -38,7 +38,7 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE := bouncycastle LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(android_bcprov_src_files) - LOCAL_JAVA_LIBRARIES := core-libart conscrypt + LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -49,7 +49,7 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE := bouncycastle-nojarjar LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(android_bcprov_src_files) - LOCAL_JAVA_LIBRARIES := core-libart conscrypt + LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) |