From 9cb090f33cabd7ceb4564d26e58a524ed07ffa63 Mon Sep 17 00:00:00 2001 From: Adam Vartanian Date: Thu, 4 Jan 2018 13:51:00 +0000 Subject: Add new bouncycastle-ocsp-nojarjar rule. This rule will be needed for integrating with tests coming in from Conscrypt, which use non-jarjared references to BC OCSP classes. Test: make bouncycastle-ocsp Change-Id: I6a46b9e9928da844a981ae8c8f5db0ab237bdf55 --- Android.bp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 028b760b..706bfb32 100644 --- a/Android.bp +++ b/Android.bp @@ -135,18 +135,26 @@ java_library_static { // OCSP classes used for testing java_library_static { - name: "bouncycastle-ocsp", + name: "bouncycastle-ocsp-nojarjar", defaults: ["bouncycastle-defaults"], srcs: [ "bcpkix/src/main/java/org/bouncycastle/cert/ocsp/**/*.java", "bcprov/src/main/java/org/bouncycastle/asn1/ocsp/**/*.java", ], + no_framework_libs: true, libs: [ "bouncycastle-nojarjar", "bouncycastle-bcpkix-nojarjar", "conscrypt", ], +} + +java_library_static { + name: "bouncycastle-ocsp", + defaults: ["bouncycastle-defaults"], + + static_libs: ["bouncycastle-ocsp-nojarjar"], jarjar_rules: "jarjar-rules.txt", java_version: "1.7", no_framework_libs: true, -- cgit v1.2.3