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

am: d252f61f66

Change-Id: Ia66748d28ecb846d190b9dacb004a734c11bc54c

Android.bp

@@ -669,9 +669,6 @@ java_defaults {
 
     no_framework_libs: true,
     libs: [
-        "conscrypt",
-        "okhttp",
-        "bouncycastle",
         "ext",
     ],
 
@@ -1083,8 +1080,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",

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