Merge "Remove dependency on conscrypt from build rules." am: c57184a7f5 am: c69cf45a36

am: 3e1fd51e25

Change-Id: I11be4324d77843b61af4d885b5f5a22ed0e501e4

1 files changed, 0 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index ffd2d704..357fed34 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",
     ],
 }