commit 8395576a314bb9e81038199355dd78d577845882
author Nicolas Geoffray <ngeoffray@google.com> Wed Mar 01 12:41:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 01 12:41:10 2017 +0000
tree 7e716d533165439fcbd4bc109b361d17c273fc4f
parent a562241deee19bc9c8626906cbbbdac6a5443e59
parent af944a69fe3335953423c7d6cff68d4dce54ea1e

Merge "Add a -testdex variant for ART run-tests." am: 6feb860f98 am: fa0d1f680a
am: af944a69fe

Change-Id: I1ee6b41054c522b8856fb1eb80b49e68b7e82f32

Android.mk

diff --git a/Android.mk b/Android.mk
index f7228cc..d8b6763 100644
--- a/Android.mk
+++ b/Android.mk
@@ -65,6 +65,19 @@
     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