commit ad3947bb4376158a270ca0b87571d533dcc7f97b
author Neil Fuller <nfuller@google.com> Fri Oct 12 03:22:04 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 12 03:22:04 2018 -0700
tree e02a701d61353065cb8ad01702786f6f5a0f92df
parent c877cf7df30f8b2f4881737c5a9d635936fe8c20
parent d252f61f66f98fa010ba54a1375fee044330633f

Merge "Remove explicit dependencies on "core" libraries" am: 18f9a2c24d
am: d252f61f66

Change-Id: Ia66748d28ecb846d190b9dacb004a734c11bc54c

Android.bp

diff --git a/Android.bp b/Android.bp
index 6a55a97..da1c13c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -669,9 +669,6 @@
 
     no_framework_libs: true,
     libs: [
-        "conscrypt",
-        "okhttp",
-        "bouncycastle",
         "ext",
     ],
 
@@ -1083,8 +1080,6 @@
      "-federationapi SupportLib $(location current/support-api.txt) "
 
 framework_docs_only_libs = [
-    "conscrypt",
-    "bouncycastle",
     "voip-common",
     "android.test.mock",
     "android-support-annotations",

tests/NetworkSecurityConfigTest/Android.mk

diff --git a/tests/NetworkSecurityConfigTest/Android.mk b/tests/NetworkSecurityConfigTest/Android.mk
index c225e17..a6c21db 100644
--- a/tests/NetworkSecurityConfigTest/Android.mk
+++ b/tests/NetworkSecurityConfigTest/Android.mk
@@ -7,7 +7,6 @@
 
 LOCAL_JAVA_LIBRARIES := \
     android.test.runner \
-    conscrypt \
     android.test.base \
 
 LOCAL_STATIC_JAVA_LIBRARIES := junit