Snap for 10102166 from 0e806edcba4a959e1098c5b478608e54ecd6dc5f to mainline-tzdata4-releaseaml_tz4_331910000android13-mainline-tzdata4-release

Change-Id: I330b85350f52ed1a8a97da72bffd68eb984a734a

1 files changed, 9 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index b160c15..04fe336 100644
--- a/Android.bp
+++ b/Android.bp
@@ -96,7 +96,8 @@ java_library {
         "//art/build/sdk",
         "//external/grpc-grpc-java/okhttp",
         "//external/robolectric-shadows",
-        "//libcore",
+        "//external/robolectric",
+        "//libcore:__subpackages__",
         "//packages/modules/ArtPrebuilt",
     ],
     srcs: [
@@ -125,6 +126,7 @@ java_library {
     visibility: [
         "//art/build/sdk",
         "//external/robolectric-shadows",
+        "//external/robolectric",
     ],
     static_libs: [
         "okhttp",
@@ -140,7 +142,11 @@ java_library {
 java_library {
     name: "okhttp-norepackage",
     host_supported: true,
-    apex_available: ["com.android.adservices"],
+    apex_available: [
+        "com.android.adservices",
+        "com.android.extservices",
+        "com.android.ondevicepersonalization",
+    ],
     visibility: [
         "//art/build/sdk",
         "//external/grpc-grpc-java/okhttp",
@@ -165,7 +171,7 @@ java_library {
     // build in manifests without frameworks/base.
     sdk_version: "core_current",
     // Make sure that this will be added to the sdk snapshot for S.
-    min_sdk_version: "S",
+    min_sdk_version: "30",
 }
 
 // Generate Version.java based on the version number from pom.xml.