diff options
| author | Tobias Thierer <tobiast@google.com> | 2018-02-07 03:08:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-07 03:08:59 +0000 |
| commit | cf806600f82c95bbf9f07cf5fff8754a15d330dd (patch) | |
| tree | 2fc0f7433d72ba1fc0e3ef4d8e62e25b4f246b05 | |
| parent | 4a506fd0492fd48681103b20fddfb6122944b511 (diff) | |
| parent | 0f126e97ce32218b6fa4693c2f23b51d90c202f9 (diff) | |
| download | bouncycastle-cf806600f82c95bbf9f07cf5fff8754a15d330dd.tar.gz | |
Merge "Pin make target bouncycastle-bcpkix to java_version 1.7." am: d45ba34702 am: 437d641301
am: 0f126e97ce
Change-Id: Ib58110fb178cc0187e3be320fd2b65a87f939dd6
| -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", |