fix: stop building pingsender executable

(cherry picked from commit ec70e94f30ff2a035a0cdfe72a814e5298648539)
This commit is contained in:
Alex Kontos
2021-09-17 11:16:06 +01:00
committed by Alex Kontos
parent ba1afa3ffc
commit a9eedab844
6 changed files with 5 additions and 48 deletions

View File

@@ -17,7 +17,6 @@
/crashhelper /crashhelper
#endif #endif
/nmhproxy /nmhproxy
/pingsender
/pk12util /pk12util
/ssltunnel /ssltunnel
/xpcshell /xpcshell

View File

@@ -402,7 +402,7 @@ bin/libfreebl_64int_3.so
; [ Ping Sender ] ; [ Ping Sender ]
; ;
@BINPATH@/pingsender@BIN_SUFFIX@ ; @BINPATH@/pingsender@BIN_SUFFIX@
; [ Native Messaging Host Proxy ] ; [ Native Messaging Host Proxy ]
; ;

View File

@@ -1589,7 +1589,6 @@ ${RemoveDefaultBrowserAgentShortcut}
Push "crashreporter.exe" Push "crashreporter.exe"
Push "default-browser-agent.exe" Push "default-browser-agent.exe"
Push "nmhproxy.exe" Push "nmhproxy.exe"
Push "pingsender.exe"
Push "updater.exe" Push "updater.exe"
Push "mozwer.dll" Push "mozwer.dll"
Push "${FileMainEXE}" Push "${FileMainEXE}"

View File

@@ -698,7 +698,6 @@ class MacArtifactJob(ArtifactJob):
"{product}-bin", "{product}-bin",
"*.dylib", "*.dylib",
"nmhproxy", "nmhproxy",
"pingsender",
"plugin-container.app/Contents/MacOS/plugin-container", "plugin-container.app/Contents/MacOS/plugin-container",
"updater.app/Contents/MacOS/net.waterfox.updater", "updater.app/Contents/MacOS/net.waterfox.updater",
# 'xpcshell', # 'xpcshell',

View File

@@ -1689,46 +1689,6 @@ export var TelemetrySendImpl = {
}, },
runPingSender(pings, observer) { runPingSender(pings, observer) {
if (AppConstants.platform === "android") {
throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED); throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
}
let suppressPingsender = Services.prefs.getBoolPref(
"toolkit.telemetry.testing.suppressPingsender",
false
);
if (suppressPingsender) {
this._log.trace("Silently skipping pingsender call in automation");
return;
}
// By default, invoke `pingsender[.exe] URL path ...`.
let exeName =
AppConstants.platform === "win" ? "pingsender.exe" : "pingsender";
let params = [];
if (lazy.NimbusFeatures.pingsender.getVariable("backgroundTaskEnabled")) {
// If using pingsender background task, invoke `firefox[.exe] --backgroundtask pingsender URL path ...`.
exeName =
AppConstants.MOZ_APP_NAME +
(AppConstants.platform === "win" ? ".exe" : "");
params = ["--backgroundtask", "pingsender"];
}
this._log.info(
`Invoking '${exeName}${params.length ? " " + params.join(" ") : ""} ...'`
);
let exe = Services.dirsvc.get("GreBinD", Ci.nsIFile);
exe.append(exeName);
params.push(...pings.flatMap(ping => [ping.url, ping.path]));
let process = Cc["@mozilla.org/process/util;1"].createInstance(
Ci.nsIProcess
);
process.init(exe);
process.startHidden = true;
process.noShell = true;
process.runAsync(params, params.length, observer);
}, },
}; };

View File

@@ -8,9 +8,9 @@ include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = "xul" FINAL_LIBRARY = "xul"
DIRS = [ # DIRS = [
"pingsender", # "pingsender",
] # ]
if CONFIG["COMPILE_ENVIRONMENT"]: if CONFIG["COMPILE_ENVIRONMENT"]:
EXPORTS.mozilla += ["!dap_ffi_generated.h"] EXPORTS.mozilla += ["!dap_ffi_generated.h"]