commit 2331c487a3285a8e0737f58d98ea2a8fb1e743fa
author Neil Vohra <neilv@google.com> Tue Aug 23 21:45:17 2022 +0000
committer Neil Vohra <neilv@google.com> Tue Sep 13 23:57:58 2022 +0000
tree ab0a1d7bfff92fc2c14bbcd9bcbc4036ef68e748
parent d5f521e041cc62328f839170f039de2ea85b8547

Set min_sdk_version and apex_available fields in gRPC libraries for use in AdServices module

Test: Presubmits
Change-Id: Ib61861afd2d7531aeeecc6eea46b01b33273442b
Bug: b/237838314
Merged-In: Ia0334515e78988bb13a61d7b68d6549003019fd0

Android.bp

diff --git a/Android.bp b/Android.bp
index 5a37d37..1bff084 100644
--- a/Android.bp
+++ b/Android.bp
@@ -78,4 +78,24 @@
         "grpc-java-okhttp",
     ],
     sdk_version: "current",
+    min_sdk_version: "33",
+    apex_available: ["com.android.adservices"],
 }
+
+java_library {
+    name: "grpc-java-core-android",
+    host_supported: true,
+    srcs: [
+        "android/src/main/java/io/grpc/android/*.java",
+    ],
+    libs: [
+        "grpc-java-core",
+        "grpc-java-core-internal",
+        "jsr305",
+        "guava",
+    ],
+    sdk_version: "current",
+    min_sdk_version: "33",
+    apex_available: ["com.android.adservices"],
+}
+

context/Android.bp

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

core/Android.bp

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

okhttp/Android.bp

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

protobuf-lite/Android.bp

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

stub/Android.bp

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