Multiprocess test client: Android child process launcher rework.

mojo/edk/embedder/platform_channel_pair_posix.cc

Index: mojo/edk/embedder/platform_channel_pair_posix.cc
diff --git a/mojo/edk/embedder/platform_channel_pair_posix.cc b/mojo/edk/embedder/platform_channel_pair_posix.cc
index 55f3ae24ab1b297910bbbfb5536f6b0b8089a961..830345ca148c251ba155349367ec3e92f9858e0d 100644
--- a/mojo/edk/embedder/platform_channel_pair_posix.cc
+++ b/mojo/edk/embedder/platform_channel_pair_posix.cc
@@ -35,6 +35,7 @@ namespace edk {
 
 namespace {
 
+#if !defined(OS_ANDROID)
 bool IsTargetDescriptorUsed(
     const base::FileHandleMappingVector& file_handle_mapping,
     int target_fd) {
@@ -44,6 +45,7 @@ bool IsTargetDescriptorUsed(
   }
   return false;
 }
+#endif
 
 }  // namespace
 
@@ -88,6 +90,7 @@ ScopedPlatformHandle PlatformChannelPair::PassClientHandleFromParentProcess(
   return PassClientHandleFromParentProcessFromString(client_fd_string);
 }
 
+#if !defined(OS_ANDROID)
 ScopedPlatformHandle
 PlatformChannelPair::PassClientHandleFromParentProcessFromString(
     const std::string& value) {
@@ -101,6 +104,7 @@ PlatformChannelPair::PassClientHandleFromParentProcessFromString(
 
   return ScopedPlatformHandle(PlatformHandle(client_fd));
 }
+#endif
 
 void PlatformChannelPair::PrepareToPassClientHandleToChildProcess(
     base::CommandLine* command_line,
@@ -121,6 +125,7 @@ void PlatformChannelPair::PrepareToPassClientHandleToChildProcess(
       PrepareToPassClientHandleToChildProcessAsString(handle_passing_info));
 }
 
+#if !defined(OS_ANDROID)
 std::string
 PlatformChannelPair::PrepareToPassClientHandleToChildProcessAsString(
       HandlePassingInformation* handle_passing_info) const {
@@ -142,6 +147,7 @@ PlatformChannelPair::PrepareToPassClientHandleToChildProcessAsString(
       std::pair<int, int>(client_handle_.get().handle, target_fd));
   return base::IntToString(target_fd);
 }
+#endif
 
 }  // namespace edk
 }  // namespace mojo