Adding upstream version 124.0.1.upstream/124.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 57 insertions, 0 deletions

diff --git a/toolkit/xre/nsAndroidStartup.cpp b/toolkit/xre/nsAndroidStartup.cpp
new file mode 100644
index 0000000000..d581dc47a4
--- /dev/null
+++ b/toolkit/xre/nsAndroidStartup.cpp
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <android/log.h>
+
+#include <jni.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <pthread.h>
+
+#include "mozilla/jni/Utils.h"
+#include "nsTArray.h"
+#include "nsString.h"
+#include "nsAppRunner.h"
+#include "mozilla/Bootstrap.h"
+#include "XREShellData.h"
+
+#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, MOZ_APP_NAME, args)
+
+using namespace mozilla;
+
+extern "C" NS_EXPORT void GeckoStart(JNIEnv* env, char** argv, int argc,
+                                     const StaticXREAppData& aAppData,
+                                     bool xpcshell, const char* outFilePath) {
+  mozilla::jni::SetGeckoThreadEnv(env);
+
+  if (!argv) {
+    LOG("Failed to get arguments for GeckoStart\n");
+    return;
+  }
+
+  if (xpcshell) {
+    XREShellData shellData;
+    FILE* outFile = fopen(outFilePath, "w");
+    if (!outFile) {
+      LOG("XRE_XPCShellMain cannot open %s", outFilePath);
+      return;
+    }
+    // We redirect both stdout and stderr to the same file, to conform with
+    // what runxpcshell.py does on Desktop.
+    shellData.outFile = outFile;
+    shellData.errFile = outFile;
+    int result = XRE_XPCShellMain(argc, argv, nullptr, &shellData);
+    fclose(shellData.outFile);
+    if (result) LOG("XRE_XPCShellMain returned %d", result);
+  } else {
+    BootstrapConfig config;
+    config.appData = &aAppData;
+    config.appDataPath = nullptr;
+
+    int result = XRE_main(argc, argv, config);
+    if (result) LOG("XRE_main returned %d", result);
+  }
+}