Snap for 8347268 from 0447f60a5216634377ccb32abef4475edabdee7d to mainline-go-conscrypt-release

Change-Id: I4eb635cf2be0e691292bebe6670fecb53790220c

1 files changed, 9 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index 0db44d2..6eeb3f8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -153,17 +153,16 @@ java_library {
         ":okhttp_version.java",
     ],
 
-    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",
-    ],
+    target: {
+        host: {
+            libs: [
+                "okhttp-android-util-log",
+            ],
+        },
+    },
 
     installable: true,
-    // Build against a "core_current" as it cannot use "current" as it has to
-    // build in manifests without frameworks/base.
-    sdk_version: "core_current",
+    sdk_version: "current",
 }
 
 // Generate Version.java based on the version number from pom.xml.
@@ -183,11 +182,9 @@ genrule {
 
 // A library to provide a stub android.util.Log symbol for
 // okhttp/src/main/java/com/squareup/okhttp/internal/Platform.java
-java_library {
+java_library_host {
     name: "okhttp-android-util-log",
-    host_supported: true,
     srcs: ["okhttp-android-util-log/src/main/java/**/*.java"],
-    sdk_version: "core_current",
 }
 
 java_library {