summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-07-10 01:08:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-10 01:08:02 +0000
commit492f13b096cd62198a801c603bb8c231c06c1b8e (patch)
treebef603b043de0aea966fe338d856c0b2d130a4dd
parentfe42c0184d3a0bef34d112e021dc7dda7799d1ee (diff)
parent234720ebe66540a53cff98b2448dddbc884bd09f (diff)
downloadandroid_external_bouncycastle-492f13b096cd62198a801c603bb8c231c06c1b8e.tar.gz
android_external_bouncycastle-492f13b096cd62198a801c603bb8c231c06c1b8e.tar.bz2
android_external_bouncycastle-492f13b096cd62198a801c603bb8c231c06c1b8e.zip
am 234720eb: Merge "Adding unbundled build target for bouncycastle"
* commit '234720ebe66540a53cff98b2448dddbc884bd09f': Adding unbundled build target for bouncycastle
-rw-r--r--Android.mk10
1 files changed, 10 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index b60d5ff..86cd8d6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -56,6 +56,16 @@ ifneq ($(TARGET_BUILD_PDK),true)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_STATIC_JAVA_LIBRARY)
+ # unbundled bouncycastle jar
+ include $(CLEAR_VARS)
+ LOCAL_MODULE := bouncycastle-unbundled
+ LOCAL_MODULE_TAGS := optional
+ LOCAL_SDK_VERSION := 9
+ LOCAL_SRC_FILES := $(ri_bcprov_src_files)
+ LOCAL_JAVACFLAGS := -encoding UTF-8
+ LOCAL_MODULE_TAGS := optional
+ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+ include $(BUILD_STATIC_JAVA_LIBRARY)
endif # TARGET_BUILD_PDK != true
# This is used to generate a list of what is unused so it can be removed when bouncycastle is updated.