diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-10-05 01:15:20 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-05 01:15:20 -0700 |
| commit | d15fe0d0cf5535325ee4f0ce54b7fa3a7d2b576f (patch) | |
| tree | 12d2cef37c3c813e5b9e9505ef5e6c774ae0742f | |
| parent | afb65b6a8dd912dfd881753f8342d4428f904041 (diff) | |
| parent | 27d081d8a8fc41f5362103d4c6a3fa304127210d (diff) | |
| download | okhttp-d15fe0d0cf5535325ee4f0ce54b7fa3a7d2b576f.tar.gz | |
Merge "Switch from conscrypt to conscrypt intra core api" am: 5bff2652cf am: 39cedfa4c0 am: bf1273c7b2
am: 27d081d8a8
Change-Id: I65d88436a84d35cc98b3e63427d91363c72bdeac
| -rw-r--r-- | Android.bp | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -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", ], |