commit 7477a0fae8a36b3a162af644817556cd3c900aaa
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Feb 18 13:07:10 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Feb 18 13:07:10 2023 +0000
tree 564bf14a37031f5c808349aba290755ddd776cff
parent c0465aa2046e11eb6991b20c1db89eff1254c495
parent f81b9c0042e8ca33fd26d86fcbe35911944ec472

Snap for 9627198 from f81b9c0042e8ca33fd26d86fcbe35911944ec472 to mainline-media-release

Change-Id: I85c9aabe4f4551952561912cdbf6590decaa3d56

Android.bp

diff --git a/Android.bp b/Android.bp
index b2333d0..0d8c554 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,8 +81,8 @@
         "grpc-java-okhttp",
     ],
     sdk_version: "current",
-    min_sdk_version: "33",
-    apex_available: ["com.android.adservices"],
+    min_sdk_version: "30",
+    apex_available: ["com.android.adservices", "com.android.extservices"],
 }
 
 java_library {
@@ -98,7 +98,7 @@
         "guava",
     ],
     sdk_version: "current",
-    min_sdk_version: "33",
-    apex_available: ["com.android.adservices"],
+    min_sdk_version: "30",
+    apex_available: ["com.android.adservices", "com.android.extservices"],
 }
 

context/Android.bp

diff --git a/context/Android.bp b/context/Android.bp
index 9840870..62b9ca4 100644
--- a/context/Android.bp
+++ b/context/Android.bp
@@ -35,6 +35,6 @@
         "jsr305",
     ],
     sdk_version: "current",
-    min_sdk_version: "33",
-    apex_available: ["com.android.adservices"],
+    min_sdk_version: "30",
+    apex_available: ["com.android.adservices", "com.android.extservices"],
 }

core/Android.bp

diff --git a/core/Android.bp b/core/Android.bp
index aefe2a9..1b177da 100644
--- a/core/Android.bp
+++ b/core/Android.bp
@@ -37,8 +37,8 @@
         "guava",
     ],
     sdk_version: "current",
-    min_sdk_version: "33",
-    apex_available: ["com.android.adservices"],
+    min_sdk_version: "30",
+    apex_available: ["com.android.adservices", "com.android.extservices"],
 }
 
 java_library {
@@ -86,8 +86,8 @@
         },
     },
     sdk_version: "current",
-    min_sdk_version: "33",
-    apex_available: ["com.android.adservices"],
+    min_sdk_version: "30",
+    apex_available: ["com.android.adservices", "com.android.extservices"],
 }
 
 java_library {

okhttp/Android.bp

diff --git a/okhttp/Android.bp b/okhttp/Android.bp
index 35d4dc2..d41d93e 100644
--- a/okhttp/Android.bp
+++ b/okhttp/Android.bp
@@ -42,6 +42,6 @@
         "okhttp-norepackage",
     ],
     sdk_version: "current",
-    min_sdk_version: "33",
-    apex_available: ["com.android.adservices"],
+    min_sdk_version: "30",
+    apex_available: ["com.android.adservices", "com.android.extservices"],
 }

protobuf-lite/Android.bp

diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp
index 983b094..7be8e14 100644
--- a/protobuf-lite/Android.bp
+++ b/protobuf-lite/Android.bp
@@ -36,6 +36,6 @@
         "libprotobuf-java-lite",
     ],
     sdk_version: "current",
-    min_sdk_version: "33",
-    apex_available: ["com.android.adservices"],
+    min_sdk_version: "30",
+    apex_available: ["com.android.adservices", "com.android.extservices"],
 }

stub/Android.bp

diff --git a/stub/Android.bp b/stub/Android.bp
index dbd3a7b..f26827f 100644
--- a/stub/Android.bp
+++ b/stub/Android.bp
@@ -36,6 +36,6 @@
         "jsr305",
     ],
     sdk_version: "current",
-    min_sdk_version: "33",
-    apex_available: ["com.android.adservices"],
+    min_sdk_version: "30",
+    apex_available: ["com.android.adservices", "com.android.extservices"],
 }