diff options
| author | Tobias Thierer <tobiast@google.com> | 2018-02-07 00:16:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-07 00:16:04 +0000 |
| commit | d45ba347021babc62fb863581d1db7f412a7c65b (patch) | |
| tree | 2fc0f7433d72ba1fc0e3ef4d8e62e25b4f246b05 | |
| parent | b024e33f994918db802b971d33e3411631eabbeb (diff) | |
| parent | 7a4f3d8c7388e354faaa7128d26e2510eb9d6597 (diff) | |
| download | bouncycastle-d45ba347021babc62fb863581d1db7f412a7c65b.tar.gz | |
Merge "Pin make target bouncycastle-bcpkix to java_version 1.7."
| -rw-r--r-- | Android.bp | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -112,6 +112,7 @@ java_library_static { 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", "conscrypt", @@ -125,6 +126,7 @@ java_library_static { static_libs: ["bouncycastle-bcpkix-nojarjar"], libs: ["conscrypt"], no_framework_libs: true, + java_version: "1.7", target: { android: { @@ -142,6 +144,7 @@ java_library_static { "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", |