commit c1262822e77cf26780d240646bacd14a67e6c301 Author: Alex Catarineu acat@torproject.org Date: Wed Apr 10 17:52:51 2019 +0200

Bug 28369: stop shipping pingsender executable --- browser/app/macbuild/Contents/MacOS-files.in | 1 - browser/installer/package-manifest.in | 4 ---- browser/installer/windows/nsis/shared.nsh | 1 - python/mozbuild/mozbuild/artifacts.py | 2 -- toolkit/components/telemetry/TelemetrySend.jsm | 17 +---------------- toolkit/components/telemetry/moz.build | 1 - 6 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/browser/app/macbuild/Contents/MacOS-files.in b/browser/app/macbuild/Contents/MacOS-files.in index bd87bc5116b7..cfa17eca813b 100644 --- a/browser/app/macbuild/Contents/MacOS-files.in +++ b/browser/app/macbuild/Contents/MacOS-files.in @@ -9,7 +9,6 @@ #if defined(MOZ_ASAN) || defined(MOZ_TSAN) /llvm-symbolizer #endif -/pingsender /pk12util /ssltunnel /webrtc-gtest diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index ede92eca6e58..bc6082198b02 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -778,10 +778,6 @@ bin/libfreebl_32int64_3.so #endif #endif

-; [ Ping Sender ] -; -@BINPATH@/pingsender@BIN_SUFFIX@ - @RESPATH@/components/dom_audiochannel.xpt

; Shutdown Terminator diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh index 4263f379db64..a0cd06cdae68 100755 --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -1337,7 +1337,6 @@ Push "xpcom.dll" Push "crashreporter.exe" Push "minidump-analyzer.exe" - Push "pingsender.exe" Push "updater.exe" Push "${FileMainEXE}" !macroend diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py index 2afe9c43fcb0..b2d560a713c9 100644 --- a/python/mozbuild/mozbuild/artifacts.py +++ b/python/mozbuild/mozbuild/artifacts.py @@ -278,7 +278,6 @@ class LinuxArtifactJob(ArtifactJob): 'firefox/firefox', 'firefox/firefox-bin', 'firefox/minidump-analyzer', - 'firefox/pingsender', 'firefox/platform.ini', 'firefox/plugin-container', 'firefox/updater', @@ -363,7 +362,6 @@ class MacArtifactJob(ArtifactJob): 'libmozavutil.dylib', 'libmozavcodec.dylib', 'libsoftokn3.dylib', - 'pingsender', 'plugin-container.app/Contents/MacOS/plugin-container', 'updater.app/Contents/MacOS/org.mozilla.updater', # 'xpcshell', diff --git a/toolkit/components/telemetry/TelemetrySend.jsm b/toolkit/components/telemetry/TelemetrySend.jsm index 00992ebaa786..249d142d82cf 100644 --- a/toolkit/components/telemetry/TelemetrySend.jsm +++ b/toolkit/components/telemetry/TelemetrySend.jsm @@ -1339,21 +1339,6 @@ var TelemetrySendImpl = { },

runPingSender(url, pingPath) { - if (AppConstants.platform === "android") { - throw Cr.NS_ERROR_NOT_IMPLEMENTED; - } - - const exeName = AppConstants.platform === "win" ? "pingsender.exe" - : "pingsender"; - - let exe = Services.dirsvc.get("GreBinD", Ci.nsIFile); - exe.append(exeName); - - let process = Cc["@mozilla.org/process/util;1"] - .createInstance(Ci.nsIProcess); - process.init(exe); - process.startHidden = true; - process.noShell = true; - process.run(/* blocking */ false, [url, pingPath], 2); + throw Cr.NS_ERROR_NOT_IMPLEMENTED; }, }; diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build index c36296a13cb7..3ddd8625def5 100644 --- a/toolkit/components/telemetry/moz.build +++ b/toolkit/components/telemetry/moz.build @@ -12,7 +12,6 @@ FINAL_LIBRARY = 'xul'

DIRS = [ 'hybrid-content', - 'pingsender', ]

DEFINES['MOZ_APP_VERSION'] = '"%s"' % CONFIG['MOZ_APP_VERSION']