From 2dfa59e898a50499fdcc1fab209d03d5c2aa7bc0 Mon Sep 17 00:00:00 2001
From: Ming-Chuan <mingcl@google.com>
Date: Tue, 7 Sep 2021 12:11:51 +0800
Subject: [PATCH] Enable server side implementation in example binder server
 app (#27259)

---
 .../io/grpc/binder/cpp/exampleserver/BUILD    |  3 +--
 .../grpc/binder/cpp/exampleserver/native.cc   | 22 +++++++------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/BUILD b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/BUILD
index dda10b1337d..5bc44c4f951 100644
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/BUILD
+++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/BUILD
@@ -26,8 +26,7 @@ cc_library(
     ],
     deps = [
         # Temporarily directly depend on this target before we expose a public API
-        # TODO(mingcl): Uncomment this after server interfaces are merged
-        # "//src/core/ext/transport/binder/server:grpc_transport_binder_server",
+        "//src/core/ext/transport/binder/server:grpc_transport_binder_server",
         "//:grpc++",
         "//examples/protos:helloworld_cc_grpc",
     ],
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc
index a64a49a2db9..346af6aa435 100644
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc
+++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc
@@ -22,10 +22,8 @@
 
 #include "examples/protos/helloworld.grpc.pb.h"
 #include "examples/protos/helloworld.pb.h"
-
-// TODO(mingcl): Uncomment this after server interfaces are merged
-// #include "src/core/ext/transport/binder/server/binder_server.h"
-// #include "src/core/ext/transport/binder/server/binder_server_credentials.h"
+#include "src/core/ext/transport/binder/server/binder_server.h"
+#include "src/core/ext/transport/binder/server/binder_server_credentials.h"
 
 namespace {
 class GreeterService : public helloworld::Greeter::Service {
@@ -60,11 +58,10 @@ Java_io_grpc_binder_cpp_exampleserver_ExportedEndpointService_init_1grpc_1server
   grpc::ServerBuilder server_builder;
   server_builder.RegisterService(&service);
 
-  // TODO(mingcl): Uncomment this after server interfaces are merged
-  //
-  // grpc_endpoint_binder_pool_init();
-  // server_builder.AddListeningPort("binder://example.service",
-  // grpc::experimental::BinderServerCredentials());
+  grpc_endpoint_binder_pool_init();
+  server_builder.AddListeningPort(
+      "binder://example.service",
+      grpc::experimental::BinderServerCredentials());
 
   server = server_builder.BuildAndStart();
 }
@@ -75,11 +72,8 @@ Java_io_grpc_binder_cpp_exampleserver_ExportedEndpointService_get_1endpoint_1bin
   __android_log_print(ANDROID_LOG_INFO, "DemoServer", "Line number %d",
                       __LINE__);
 
-  // TODO(mingcl): Uncomment this after server interfaces are merged
-  // auto ai_binder =
-  // static_cast<AIBinder*>(grpc::experimental::binder::GetEndpointBinder("example.service"));
-
-  AIBinder* ai_binder = nullptr;
+  auto ai_binder = static_cast<AIBinder*>(
+      grpc::experimental::binder::GetEndpointBinder("example.service"));
 
   __android_log_print(ANDROID_LOG_INFO, "DemoServer", "ai_binder = %p",
                       ai_binder);