diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-05 15:12:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-05 15:12:22 +0000 |
| commit | b024e33f994918db802b971d33e3411631eabbeb (patch) | |
| tree | 602dfac497f9e3cb00e601207de98991fe5481d7 | |
| parent | f3df57364fab1d244d6b83bce963dc67ea66b37a (diff) | |
| parent | 9cb090f33cabd7ceb4564d26e58a524ed07ffa63 (diff) | |
| download | bouncycastle-b024e33f994918db802b971d33e3411631eabbeb.tar.gz | |
Merge "Add new bouncycastle-ocsp-nojarjar rule."android-wear-8.0.0_r1
| -rw-r--r-- | Android.bp | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -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, |