aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-03-02 19:02:23 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-03-02 19:02:23 +0000
commit956dc02997ec74e208ead5fbed6a46b4187b1d1d (patch)
tree564bf14a37031f5c808349aba290755ddd776cff
parent41ace9d52ad3dcd5e39196e9cb072503cc2eca5d (diff)
parentf81b9c0042e8ca33fd26d86fcbe35911944ec472 (diff)
downloadgrpc-grpc-java-android13-mainline-cellbroadcast-release.tar.gz
Snap for 9678129 from f81b9c0042e8ca33fd26d86fcbe35911944ec472 to mainline-cellbroadcast-releaseaml_cbr_331910000aml_cbr_331810000aml_cbr_331710020android13-mainline-cellbroadcast-release
Change-Id: I39c0ce51cd9c944114b423474fe6f7e4734eb2fa
-rw-r--r--Android.bp8
-rw-r--r--context/Android.bp4
-rw-r--r--core/Android.bp8
-rw-r--r--okhttp/Android.bp4
-rw-r--r--protobuf-lite/Android.bp4
-rw-r--r--stub/Android.bp4
6 files changed, 16 insertions, 16 deletions
diff --git a/Android.bp b/Android.bp
index b2333d047..0d8c5547b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,8 +81,8 @@ java_library {
"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 @@ java_library {
"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"],
}
diff --git a/context/Android.bp b/context/Android.bp
index 98408708f..62b9ca439 100644
--- a/context/Android.bp
+++ b/context/Android.bp
@@ -35,6 +35,6 @@ java_library {
"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"],
}
diff --git a/core/Android.bp b/core/Android.bp
index aefe2a9ca..1b177da22 100644
--- a/core/Android.bp
+++ b/core/Android.bp
@@ -37,8 +37,8 @@ java_library {
"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 @@ java_library {
},
},
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 {
diff --git a/okhttp/Android.bp b/okhttp/Android.bp
index 35d4dc247..d41d93e9e 100644
--- a/okhttp/Android.bp
+++ b/okhttp/Android.bp
@@ -42,6 +42,6 @@ java_library {
"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"],
}
diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp
index 983b09421..7be8e14ca 100644
--- a/protobuf-lite/Android.bp
+++ b/protobuf-lite/Android.bp
@@ -36,6 +36,6 @@ java_library {
"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"],
}
diff --git a/stub/Android.bp b/stub/Android.bp
index dbd3a7b38..f26827f52 100644
--- a/stub/Android.bp
+++ b/stub/Android.bp
@@ -36,6 +36,6 @@ java_library {
"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"],
}