diff options
author | Narayan Kamath <narayan@google.com> | 2018-03-02 11:39:38 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-03-02 11:39:38 +0000 |
commit | 9e2c31d348381281031d0f28cefe74879514d714 (patch) | |
tree | cf4c0f9e80627cf50b6f31270afff3cb05037cef | |
parent | deb69a18c9142b4c672327ef381340d98e0c766a (diff) | |
parent | 55af4817a842f0577a1feb7f2ab9e9bb049ceba6 (diff) | |
download | bouncycastle-9e2c31d348381281031d0f28cefe74879514d714.tar.gz |
Merge "Switch bouncycastle-nojarjar -> bouncycastle-unbundled." am: 70d9b6a2d8 am: e0053a88ef
am: 55af4817a8
Change-Id: I98647f9abe59ac337947e81c71e3b4922ee7fe3e
-rw-r--r-- | Android.bp | 75 |
1 files changed, 29 insertions, 46 deletions
@@ -45,7 +45,7 @@ java_defaults { // non-jarjar version to build okhttp-tests java_library_static { - name: "bouncycastle-nojarjar", + name: "bouncycastle-unbundled", defaults: ["bouncycastle-defaults"], srcs: ["bcprov/src/main/java/**/*.java"], @@ -53,7 +53,7 @@ java_library_static { "bcprov/src/main/java/org/bouncycastle/asn1/ocsp/**/*.java", ], - no_framework_libs: true, + sdk_version: "9", java_version: "1.7", } @@ -61,7 +61,7 @@ java_library { name: "bouncycastle", defaults: ["bouncycastle-defaults"], - static_libs: ["bouncycastle-nojarjar"], + static_libs: ["bouncycastle-unbundled"], no_framework_libs: true, java_version: "1.7", @@ -79,45 +79,18 @@ java_library { name: "bouncycastle-testdex", defaults: ["bouncycastle-defaults"], - static_libs: ["bouncycastle-nojarjar"], + static_libs: ["bouncycastle-unbundled"], no_framework_libs: true, jarjar_rules: "jarjar-rules.txt", java_version: "1.7", } -// unbundled bouncycastle jar -java_library_static { - name: "bouncycastle-unbundled", - defaults: [ - "bouncycastle-errorprone-defaults", - ], - - sdk_version: "9", - srcs: ["bcprov/src/main/java/**/*.java"], - exclude_srcs: [ - "bcprov/src/main/java/org/bouncycastle/asn1/ocsp/**/*.java", - ], -} - // PKIX classes used for testing java_library_static { - name: "bouncycastle-bcpkix-nojarjar", - defaults: ["bouncycastle-defaults"], - - srcs: ["bcpkix/src/main/java/**/*.java"], - exclude_srcs: ["bcpkix/src/main/java/org/bouncycastle/cert/ocsp/**/*.java"], - no_framework_libs: true, - java_version: "1.7", - libs: [ - "bouncycastle-nojarjar", - ], -} - -java_library_static { name: "bouncycastle-bcpkix", defaults: ["bouncycastle-defaults"], - static_libs: ["bouncycastle-bcpkix-nojarjar"], + static_libs: ["bouncycastle-bcpkix-unbundled"], no_framework_libs: true, java_version: "1.7", @@ -128,33 +101,43 @@ java_library_static { }, } -// OCSP classes used for testing java_library_static { - 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", - ], - java_version: "1.7", - no_framework_libs: true, - libs: [ - "bouncycastle-nojarjar", - "bouncycastle-bcpkix-nojarjar", + name: "bouncycastle-bcpkix-unbundled", + defaults: [ + "bouncycastle-defaults", ], + libs: [ "bouncycastle-unbundled" ], + sdk_version: "9", + srcs: ["bcpkix/src/main/java/**/*.java"], + exclude_srcs: ["bcpkix/src/main/java/org/bouncycastle/cert/ocsp/**/*.java"], } + +// OCSP classes used for testing java_library_static { name: "bouncycastle-ocsp", defaults: ["bouncycastle-defaults"], - static_libs: ["bouncycastle-ocsp-nojarjar"], + static_libs: ["bouncycastle-ocsp-unbundled"], jarjar_rules: "jarjar-rules.txt", java_version: "1.7", no_framework_libs: true, } +java_library_static { + name: "bouncycastle-ocsp-unbundled", + defaults: [ + "bouncycastle-defaults", + ], + libs: [ "bouncycastle-unbundled", + "bouncycastle-bcpkix-unbundled" ], + sdk_version: "9", + srcs: [ + "bcpkix/src/main/java/org/bouncycastle/cert/ocsp/**/*.java", + "bcprov/src/main/java/org/bouncycastle/asn1/ocsp/**/*.java", + ], +} + // For compatibilityy with old bouncycastle-host and bouncycastle-bcpkix-host names java_library_host { name: "bouncycastle-host", |