diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-04-03 13:52:30 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-04-03 13:52:30 -0700 |
| commit | c7d0f2f2c5d6a9ed99c1c4ee182dbf57b28830ae (patch) | |
| tree | 81f536de9bf4d044a479534082372a93d42ff9a3 | |
| parent | 8c18c33a4188b609bc9a9b22d0997a9613cf81d1 (diff) | |
| parent | bc044035f961fb5163a6adef2cef22b82d7a197c (diff) | |
| download | bouncycastle-c7d0f2f2c5d6a9ed99c1c4ee182dbf57b28830ae.tar.gz | |
resolved conflicts for merge of bc044035 to jb-mr2-dev-plus-aosp
Change-Id: I84b64f377d0bb1503884ec83e88680569c26ef71
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -40,6 +40,17 @@ LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_JAVA_LIBRARY) +# non-jarjar version to build okhttp-tests +include $(CLEAR_VARS) +LOCAL_MODULE := bouncycastle-nojarjar +LOCAL_MODULE_TAGS := optional +LOCAL_SRC_FILES := $(android_bcprov_src_files) +LOCAL_JAVACFLAGS := -encoding UTF-8 +LOCAL_JAVA_LIBRARIES := core +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +include $(BUILD_JAVA_LIBRARY) + # This is used to generate a list of what is unused so it can be removed when bouncycastle is updated. # Based on "Finding dead code" example in ProGuard manual at http://proguard.sourceforge.net/ .PHONY: bouncycastle-proguard-deadcode |