diff options
author | Narayan Kamath <narayan@google.com> | 2018-02-28 15:04:20 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-02-28 15:04:20 +0000 |
commit | c69cf45a36c7c6ac387feab02e3e0773b63e53a4 (patch) | |
tree | c0d1051ef6e660cf1e58e3bd6667857fc2bb734d | |
parent | 34052b062b714922d3e94ef7e2aaaba7db35c828 (diff) | |
parent | c57184a7f546cd89d5292741814e5dbd0ee1721f (diff) | |
download | bouncycastle-c69cf45a36c7c6ac387feab02e3e0773b63e53a4.tar.gz |
Merge "Remove dependency on conscrypt from build rules."
am: c57184a7f5
Change-Id: I087970f583df44ac3cd14353ff7aa21919b1642e
-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", ], } |