From db68fd63bf924969ee0b5f219d6d6a092b45e213 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 2 Oct 2019 14:01:10 +0100 Subject: Switch from conscrypt to conscrypt intra core api Bug: 129126571 Test: m checkbuild Change-Id: I2cff35894fbe80f8cf37aa528d9b5eea953c5586 --- Android.bp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Android.bp b/Android.bp index c0314a0..ee7ff2f 100644 --- a/Android.bp +++ b/Android.bp @@ -49,8 +49,7 @@ java_library { sdk_version: "none", system_modules: "core-all-system-modules", libs: [ - // TODO(b/129126571): Depend on Conscrypt stubs instead - "conscrypt", + "conscrypt.module.intra.core.api.stubs", ], java_version: "1.7", } @@ -79,8 +78,7 @@ java_library { sdk_version: "none", system_modules: "core-all-system-modules", libs: [ - // TODO(b/129126571): Depend on Conscrypt stubs instead - "conscrypt", + "conscrypt.module.intra.core.api.stubs", ], java_version: "1.7", } @@ -100,8 +98,7 @@ java_library { sdk_version: "none", system_modules: "core-all-system-modules", libs: [ - // TODO(b/129126571): Depend on Conscrypt stubs instead - "conscrypt", + "conscrypt.module.intra.core.api.stubs", ], dex_preopt: { enabled: false, @@ -132,7 +129,7 @@ java_library { libs: [ "okhttp-nojarjar", "junit", - "conscrypt", + "conscrypt.module.intra.core.api.stubs", "bouncycastle-unbundled", ], -- cgit v1.2.3