diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-10-05 07:19:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-05 07:19:35 +0000 |
| commit | 5bff2652cf4d5214cee3484061b9799c78a8c040 (patch) | |
| tree | 12d2cef37c3c813e5b9e9505ef5e6c774ae0742f | |
| parent | c56d7050362a461e413734af327cfc62f89c3db2 (diff) | |
| parent | db68fd63bf924969ee0b5f219d6d6a092b45e213 (diff) | |
| download | okhttp-ndk-sysroot-r21.tar.gz | |
Merge "Switch from conscrypt to conscrypt intra core api"ndk-sysroot-r21
| -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", ], |