Commit 7ec5af04 authored by Csoregi Natalia's avatar Csoregi Natalia
Browse files

Backed out changeset 3237c9532102 (bug 1440034) for breaking Android builds. CLOSED TREE

parent fb6210ff

ipc/glue/GeckoChildProcessHost.cpp

+2 −10
Original line number Diff line number Diff line
@@ -1193,16 +1193,8 @@ GeckoChildProcessHost::LaunchAndroidService(const char* type, 
  int32_t ipcFd = it->first;

  it++;

  // If the Crash Reporter is disabled, there will not be a second file descriptor.

  int32_t crashFd = -1

  int32_t crashAnnotationFd = -1;

  if (it != fds_to_remap.end()) {

    crashFd = it->first;

    it++;

  }

  if (it != fds_to_remap.end()) {

    crashAnnotationFd = it->first;

    it++;

  }

  int32_t crashFd = (it != fds_to_remap.end()) ? it->first : -1;

  int32_t crashAnnotationFd = (it != fds_to_remap.end()) ? it->first : -1;

  int32_t handle = java::GeckoProcessManager::Start(type, jargs, crashFd, ipcFd, crashAnnotationFd);



  if (process_handle) {