summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Neil Fuller <nfuller@google.com> 2018-10-12 03:12:22 -0700
committer android-build-merger <android-build-merger@google.com> 2018-10-12 03:12:22 -0700
commitd252f61f66f98fa010ba54a1375fee044330633f (patch)
treef8e2352a3b7b7c8ad6c1c38a4d66453dfb5983bd
parent689f888627087a8052c60d895f612d3385acdca8 (diff)
parent18f9a2c24d59d85788a30bdcb5530e82c87a3294 (diff)
Merge "Remove explicit dependencies on "core" libraries"
am: 18f9a2c24d Change-Id: I326380ec0c10f29c09c64f4044a9c79c9ab2648f
-rw-r--r--Android.bp5
-rw-r--r--tests/NetworkSecurityConfigTest/Android.mk1
2 files changed, 0 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index ad3c14cdd5ac..85d1aa88c74d 100644
--- a/Android.bp
+++ b/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",
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