diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-06-03 21:00:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-03 21:00:31 -0700 |
| commit | 967bfc2db4c544ad1f98e1bcd25217f6ba6686b6 (patch) | |
| tree | 2595fa417fa3df69f939695550222a856c53e058 | |
| parent | 11bb2bddc5260b343ce81b1a46fad5cb0467632a (diff) | |
| parent | 39bddb1f9333ff79d3f82f38d7ee67f5fc3667c6 (diff) | |
| download | bouncycastle-967bfc2db4c544ad1f98e1bcd25217f6ba6686b6.tar.gz | |
am 39bddb1f: am ff9f947b: Merge changes I8c8f1572,Idc2bbd24
* commit '39bddb1f9333ff79d3f82f38d7ee67f5fc3667c6':
Track changes to JSSE
Allow CipherTest to run on RI
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -15,12 +15,15 @@ # LOCAL_PATH := $(call my-dir) +# used for bouncycastle-hostdex where we want everything for testing all_bcprov_src_files := $(call all-java-files-under,bcprov/src/main/java) +# used for bouncycastle for target where we want to be sure to use OpenSSLDigest android_bcprov_src_files := $(filter-out \ bcprov/src/main/java/org/bouncycastle/crypto/digests/AndroidDigestFactoryBouncyCastle.java, \ $(all_bcprov_src_files)) +# used for bouncycastle-host where we can't use OpenSSLDigest ri_bcprov_src_files := $(filter-out \ bcprov/src/main/java/org/bouncycastle/crypto/digests/AndroidDigestFactoryOpenSSL.java \ bcprov/src/main/java/org/bouncycastle/crypto/digests/OpenSSLDigest.java, \ @@ -92,7 +95,7 @@ ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-hostdex LOCAL_MODULE_TAGS := optional - LOCAL_SRC_FILES := $(android_bcprov_src_files) + LOCAL_SRC_FILES := $(all_bcprov_src_files) LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_BUILD_HOST_DEX := true LOCAL_MODULE_TAGS := optional |