diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
| commit | 39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch) | |
| tree | 52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /xpcom/base/nsMemoryInfoDumper.cpp | |
| parent | a1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff) | |
| parent | c2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff) | |
| download | UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip | |
Merge branch 'redwood' into 28.9-platform
Diffstat (limited to 'xpcom/base/nsMemoryInfoDumper.cpp')
| -rw-r--r-- | xpcom/base/nsMemoryInfoDumper.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp index afb18382d..c2371a1c0 100644 --- a/xpcom/base/nsMemoryInfoDumper.cpp +++ b/xpcom/base/nsMemoryInfoDumper.cpp @@ -576,13 +576,6 @@ public: return rv; } - #ifdef ANDROID - rv = reportsFinalFile->AppendNative(NS_LITERAL_CSTRING("memory-reports")); - if (NS_WARN_IF(NS_FAILED(rv))) { - return rv; - } - #endif - rv = reportsFinalFile->AppendNative(mReportsFilename); if (NS_WARN_IF(NS_FAILED(rv))) { return rv; @@ -748,9 +741,8 @@ nsMemoryInfoDumper::DumpMemoryInfoToTempDir(const nsAString& aIdentifier, nsCOMPtr<nsIFile> reportsTmpFile; nsresult rv; - // In Android case, this function will open a file named aFilename under - // specific folder (/data/local/tmp/memory-reports). Otherwise, it will - // open a file named aFilename under "NS_OS_TEMP_DIR". + + // This will open a file named aFilename under "NS_OS_TEMP_DIR". rv = nsDumpUtils::OpenTempFile(NS_LITERAL_CSTRING("incomplete-") + reportsFinalFilename, getter_AddRefs(reportsTmpFile), |