summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2018-10-04 11:03:39 +0100
committerNeil Fuller <nfuller@google.com>2018-10-12 21:03:17 +0000
commit15a23db3ea7eb41b317f0d9216001316d8b9225d (patch)
tree3b5dd639a38f830061df8252ceb99f881306523a
parent144324ce064238501a0c5f9a82417a37333a2f19 (diff)
Remove explicit dependencies on "core" libraries
The dependencies are unnecessary since bouncycastle and conscrypt are included in the "standard libraries". Test: build Bug: 113148576 Merged-In: Ic059bd60a7e34550ff65d6226d65b70ee52c6bc8 Change-Id: Ic059bd60a7e34550ff65d6226d65b70ee52c6bc8
-rw-r--r--service/Android.mk2
-rw-r--r--tests/wifitests/Android.mk3
2 files changed, 1 insertions, 4 deletions
diff --git a/service/Android.mk b/service/Android.mk
index 83dc1430e..2be923967 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -57,8 +57,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, java) \
LOCAL_JAVA_LIBRARIES := \
android.hidl.manager-V1.0-java \
- bouncycastle \
- conscrypt \
error_prone_annotations \
jsr305 \
services
diff --git a/tests/wifitests/Android.mk b/tests/wifitests/Android.mk
index c1082f81f..04e09da1a 100644
--- a/tests/wifitests/Android.mk
+++ b/tests/wifitests/Android.mk
@@ -64,8 +64,7 @@ LOCAL_JAVA_LIBRARIES := \
android.test.runner \
android.hidl.manager-V1.0-java \
android.test.base \
- android.test.mock \
- conscrypt
+ android.test.mock
# These must be explicitly included because they are not normally accessible
# from apps.