From 066ca1737225fa9bfea38299a64dd57a01ac2aa4 Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Thu, 4 Oct 2018 10:45:21 +0100
Subject: Remove explicit dependencies on "core" libraries

The dependencies are unnecessary since bouncycastle, okhttp
and conscrypt are included in the "standard libraries".

Test: build
Bug: 113148576
Change-Id: Ic8d15d911decbdd6391db8c1231b845353586a54
---
 Android.bp                                 | 5 -----
 tests/NetworkSecurityConfigTest/Android.mk | 1 -
 2 files changed, 6 deletions(-)

diff --git a/Android.bp b/Android.bp
index 5af63998b0e5..f0a6bbbd6de7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -668,9 +668,6 @@ java_defaults {
 
     no_framework_libs: true,
     libs: [
-        "conscrypt",
-        "okhttp",
-        "bouncycastle",
         "ext",
     ],
 
@@ -1082,8 +1079,6 @@ framework_docs_only_args = " -android -manifest $(location core/res/AndroidManif
      "-federationapi SupportLib $(location current/support-api.txt) "
 
 framework_docs_only_libs = [
-    "conscrypt",
-    "bouncycastle",
     "voip-common",
     "android.test.mock",
     "android-support-annotations",
diff --git a/tests/NetworkSecurityConfigTest/Android.mk b/tests/NetworkSecurityConfigTest/Android.mk
index c225e170c377..a6c21db16846 100644
--- a/tests/NetworkSecurityConfigTest/Android.mk
+++ b/tests/NetworkSecurityConfigTest/Android.mk
@@ -7,7 +7,6 @@ LOCAL_CERTIFICATE := platform
 
 LOCAL_JAVA_LIBRARIES := \
     android.test.runner \
-    conscrypt \
     android.test.base \
 
 LOCAL_STATIC_JAVA_LIBRARIES := junit
-- 
cgit v1.2.3-59-g8ed1b