Add a -testdex variant for ART run-tests.
bug:24535627
Change-Id: I091525f8a294686ecec0cd99d8222ed1796cd394
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