From 6a174662f918a387a2eeace869e4b513aa2feba9 Mon Sep 17 00:00:00 2001
From: Julien Desprez <jdesprez@google.com>
Date: Fri, 30 Jun 2023 05:16:16 +0000
Subject: Set java_version on lib used in grpc-java

Change-Id: I7b75e51fe4b496438fd4bac38de01b0d7cfdb78b
Test: presubmit
Bug: 289402777
---
 okhttp/Android.bp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/okhttp/Android.bp b/okhttp/Android.bp
index 39bd4f4a6..3505cb48e 100644
--- a/okhttp/Android.bp
+++ b/okhttp/Android.bp
@@ -54,4 +54,6 @@ java_library {
         "com.android.devicelock",
         "com.android.extservices",
     ],
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
 }
-- 
cgit v1.2.3


From 30a6532bec1d8a2f59f207f4fc113c12db2d99c0 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 8 Nov 2023 21:56:48 +0000
Subject: Adding soong build rule for grpc-binder

Bug: 266975895
Test: make grpc-java-binder
Change-Id: Icb7d6ef42b4ddd09b04b766dbea26546ceedd343
---
 binder/Android.bp                   | 37 +++++++++++++++++++++++++++++++++++++
 binder/src/main/AndroidManifest.xml |  3 ++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 binder/Android.bp

diff --git a/binder/Android.bp b/binder/Android.bp
new file mode 100644
index 000000000..5351cd9ca
--- /dev/null
+++ b/binder/Android.bp
@@ -0,0 +1,37 @@
+// Copyright (C) 2023 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+    default_applicable_licenses: ["external_grpc-grpc-java_license"],
+}
+
+android_library {
+    name: "grpc-java-binder",
+    srcs: [
+        "src/main/java/**/*.java",
+    ],
+    libs: [
+        "error_prone_annotations",
+        "guava",
+        "grpc-java-core",
+        "grpc-java-core-internal",
+        "androidx.annotation_annotation",
+        "androidx.core_core",
+        "grpc-java-context"
+    ],
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
+    sdk_version: "current",
+    manifest: "src/main/AndroidManifest.xml",
+}
diff --git a/binder/src/main/AndroidManifest.xml b/binder/src/main/AndroidManifest.xml
index a30cbbdd6..b091ecd7f 100644
--- a/binder/src/main/AndroidManifest.xml
+++ b/binder/src/main/AndroidManifest.xml
@@ -1,2 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="io.grpc.binder" >
 </manifest>
-- 
cgit v1.2.3