diff options
| author | Adam Vartanian <flooey@google.com> | 2018-01-05 15:19:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-05 15:19:43 +0000 |
| commit | 50d3890452b0b866e2f5eee18b9e6c96f11cc8d6 (patch) | |
| tree | 602dfac497f9e3cb00e601207de98991fe5481d7 | |
| parent | 9d5120d3d80654e3ffa98b65e57a8506f25d52ea (diff) | |
| parent | 67ca012c89f80c0f0d2467dd3d5ece20c2d6d964 (diff) | |
| download | bouncycastle-50d3890452b0b866e2f5eee18b9e6c96f11cc8d6.tar.gz | |
Merge "Add new bouncycastle-ocsp-nojarjar rule." am: b024e33f99
am: 67ca012c89
Change-Id: I76f0a8040730f3997e17324c766df61526c49453
| -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, |