commit c57184a7f546cd89d5292741814e5dbd0ee1721f
author Narayan Kamath <narayan@google.com> Wed Feb 28 14:54:18 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 28 14:54:18 2018 +0000
tree c0d1051ef6e660cf1e58e3bd6667857fc2bb734d
parent da99ea9b0b28db8392ea41bc495623942a99e39d
parent dc738435929d96f4012514e94c2cb0e4c5efffb4

Merge "Remove dependency on conscrypt from build rules."

Android.bp

diff --git a/Android.bp b/Android.bp
index ffd2d70..357fed3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -68,7 +68,6 @@
             ],
         },
     },
-    libs: ["conscrypt"],
     no_framework_libs: true,
     java_version: "1.7",
 }
@@ -78,7 +77,6 @@
     defaults: ["bouncycastle-defaults"],
 
     static_libs: ["bouncycastle-nojarjar"],
-    libs: ["conscrypt"],
     no_framework_libs: true,
     java_version: "1.7",
 
@@ -97,7 +95,6 @@
     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_version: "1.7",
     libs: [
         "bouncycastle-nojarjar",
-        "conscrypt",
     ],
 }
 
@@ -139,7 +135,6 @@
     defaults: ["bouncycastle-defaults"],
 
     static_libs: ["bouncycastle-bcpkix-nojarjar"],
-    libs: ["conscrypt"],
     no_framework_libs: true,
     java_version: "1.7",
 
@@ -164,7 +159,6 @@
     libs: [
         "bouncycastle-nojarjar",
         "bouncycastle-bcpkix-nojarjar",
-        "conscrypt",
     ],
 }