diff options
author | Narayan Kamath <narayan@google.com> | 2018-02-28 15:11:23 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-02-28 15:11:23 +0000 |
commit | 3e1fd51e25e93cbecf26aac3d89dff1d72450680 (patch) | |
tree | c0d1051ef6e660cf1e58e3bd6667857fc2bb734d | |
parent | d4ad5d4a46b3c370d255e2e7121e7f758f1499af (diff) | |
parent | c69cf45a36c7c6ac387feab02e3e0773b63e53a4 (diff) | |
download | bouncycastle-3e1fd51e25e93cbecf26aac3d89dff1d72450680.tar.gz |
Merge "Remove dependency on conscrypt from build rules." am: c57184a7f5
am: c69cf45a36
Change-Id: Idf60c14a63f5e2038927acf745e8949faa96af34
-rw-r--r-- | Android.bp | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -68,7 +68,6 @@ java_library_static { ], }, }, - libs: ["conscrypt"], no_framework_libs: true, java_version: "1.7", } @@ -78,7 +77,6 @@ java_library { defaults: ["bouncycastle-defaults"], static_libs: ["bouncycastle-nojarjar"], - libs: ["conscrypt"], no_framework_libs: true, java_version: "1.7", @@ -97,7 +95,6 @@ java_library { defaults: ["bouncycastle-defaults"], static_libs: ["bouncycastle-nojarjar"], - libs: ["conscrypt"], no_framework_libs: true, jarjar_rules: "jarjar-rules.txt", java_version: "1.7", @@ -130,7 +127,6 @@ java_library_static { java_version: "1.7", libs: [ "bouncycastle-nojarjar", - "conscrypt", ], } @@ -139,7 +135,6 @@ java_library_static { defaults: ["bouncycastle-defaults"], static_libs: ["bouncycastle-bcpkix-nojarjar"], - libs: ["conscrypt"], no_framework_libs: true, java_version: "1.7", @@ -164,7 +159,6 @@ java_library_static { libs: [ "bouncycastle-nojarjar", "bouncycastle-bcpkix-nojarjar", - "conscrypt", ], } |