diff options
| author | Neil Fuller <nfuller@google.com> | 2018-10-12 15:03:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-12 15:03:19 +0000 |
| commit | 17ad0b782b780a577c3953fc5f7e168f85de3596 (patch) | |
| tree | 1ec8c4beb5085274a984e4ebb10b02585a8940c0 | |
| parent | e79587f456bfe6832d025ffa77c4b957fafcfd13 (diff) | |
| parent | 1a022c1a94cfb77384f037f75f71b0b18e80456f (diff) | |
| download | okhttp-oreo-mr1-1.2-iot-release.tar.gz | |
Merge "Adjust dependencies on "core" libraries"android-o-mr1-iot-release-smart-display-r3oreo-mr1-1.2-iot-release
| -rw-r--r-- | Android.bp | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -92,11 +92,15 @@ java_library_static { // Exclude test Android currently has problems with due to @Parameterized (requires JUnit 4.11). exclude_srcs: ["okhttp-tests/src/test/java/com/squareup/okhttp/WebPlatformUrlTest.java"], + no_standard_libs: true, libs: [ + "core-all", "okhttp-nojarjar", "junit", + "conscrypt", "bouncycastle-unbundled", ], - no_framework_libs: true, + system_modules: "core-all-system-modules", + java_version: "1.7", } |