diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2017-03-01 12:31:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-01 12:31:03 +0000 |
| commit | 6feb860f988cd848595782946fd16d6b536d3fb8 (patch) | |
| tree | 7e716d533165439fcbd4bc109b361d17c273fc4f | |
| parent | cd2014ba3772c209f487d168a55d785eef2d324f (diff) | |
| parent | 5705099c74578e44798229297390707b25eb6c03 (diff) | |
| download | bouncycastle-6feb860f988cd848595782946fd16d6b536d3fb8.tar.gz | |
Merge "Add a -testdex variant for ART run-tests."android-o-preview-1android-n-mr2-preview-2o-preview
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -65,6 +65,19 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_JAVA_LIBRARY) + # A guaranteed unstripped version of bouncycastle. + # The build system may or may not strip the bouncycastle jar, but this one will + # not be stripped. See b/24535627. + include $(CLEAR_VARS) + LOCAL_MODULE := bouncycastle-testdex + LOCAL_MODULE_TAGS := optional + LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-nojarjar + LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt + LOCAL_NO_STANDARD_LIBRARIES := true + LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt + LOCAL_JAVA_LANGUAGE_VERSION := 1.7 + include $(BUILD_JAVA_LIBRARY) + # unbundled bouncycastle jar include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-unbundled |