Snap for 8564071 from d5e1058d4e6271ddae0b4514738da41fcc39e7d9 to mainline-adbd-releaseaml_adb_331113120aml_adb_331011050aml_adb_331011040android13-mainline-adbd-release

Change-Id: I6c8ced69df11b9df9d855c72877e8c860fe72980

2 files changed, 13 insertions, 10 deletions

diff --git a/Android.bp b/Android.bp
index 6eeb3f8..0db44d2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -153,16 +153,17 @@ java_library {
         ":okhttp_version.java",
     ],
 
-    target: {
-        host: {
-            libs: [
-                "okhttp-android-util-log",
-            ],
-        },
-    },
+    libs: [
+        // Building against "core_current" means that the android.util.Log API
+        // is not available. This provides stubs for it which allows the code to
+        // compile.
+        "okhttp-android-util-log",
+    ],
 
     installable: true,
-    sdk_version: "current",
+    // Build against a "core_current" as it cannot use "current" as it has to
+    // build in manifests without frameworks/base.
+    sdk_version: "core_current",
 }
 
 // Generate Version.java based on the version number from pom.xml.
@@ -182,9 +183,11 @@ genrule {
 
 // A library to provide a stub android.util.Log symbol for
 // okhttp/src/main/java/com/squareup/okhttp/internal/Platform.java
-java_library_host {
+java_library {
     name: "okhttp-android-util-log",
+    host_supported: true,
     srcs: ["okhttp-android-util-log/src/main/java/**/*.java"],
+    sdk_version: "core_current",
 }
 
 java_library {
diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/DiskLruCacheTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/DiskLruCacheTest.java
index bf6e158..f5cd63e 100644
--- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/DiskLruCacheTest.java
+++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/DiskLruCacheTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.fail;
 
 public final class DiskLruCacheTest {
   @Rule public final TemporaryFolder tempDir = new TemporaryFolder();
-  @Rule public final Timeout timeout = new Timeout(30 * 1000);
+  @Rule public final Timeout timeout = new Timeout(60 * 1000);
 
   private final FaultyFileSystem fileSystem = new FaultyFileSystem(FileSystem.SYSTEM);
   private final int appVersion = 100;