Bug 1567341 - Add outFile, errFile parameters to XREShellData. r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D106201

js/xpconnect/src/XPCShellImpl.cpp

@@ -49,6 +49,7 @@
 
 #ifdef ANDROID
 #  include <android/log.h>
+#  include "XREShellData.h"
 #endif
 
 #ifdef XP_WIN
@@ -1040,8 +1041,13 @@ int XRE_XPCShellMain(int argc, char** argv, char** envp,
   int result = 0;
   nsresult rv;
 
-  gErrFile = stderr;
+#ifdef ANDROID
+  gOutFile = aShellData->outFile;
+  gErrFile = aShellData->errFile;
+#else
   gOutFile = stdout;
+  gErrFile = stderr;
+#endif
   gInFile = stdin;
 
   NS_LogInit();

xpcom/build/XREShellData.h

@@ -23,6 +23,10 @@ struct XREShellData {
    */
   sandbox::BrokerServices* sandboxBrokerServices;
 #endif
+#if defined(ANDROID)
+  FILE* outFile;
+  FILE* errFile;
+#endif
 };
 
 #endif  // XREShellData_h