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/nsDumpUtils.h | |
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/nsDumpUtils.h')
-rw-r--r-- | xpcom/base/nsDumpUtils.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/xpcom/base/nsDumpUtils.h b/xpcom/base/nsDumpUtils.h index 12a99da18..9bca55927 100644 --- a/xpcom/base/nsDumpUtils.h +++ b/xpcom/base/nsDumpUtils.h @@ -19,12 +19,7 @@ #undef LOG #endif -#ifdef ANDROID -#include "android/log.h" -#define LOG(...) __android_log_print(ANDROID_LOG_INFO, "Gecko:DumpUtils", ## __VA_ARGS__) -#else #define LOG(...) -#endif #ifdef XP_UNIX // { @@ -189,9 +184,8 @@ public: /** * This function creates a new unique file based on |aFilename| in a - * world-readable temp directory. This is the system temp directory - * or, in the case of Android, the downloads directory. If |aFile| is - * non-null, it is assumed to point to a folder, and that folder is used + * world-readable temp directory. This is the system temp directory. + * If |aFile| is non-null, it is assumed to point to a folder, and that folder is used * instead. */ static nsresult OpenTempFile(const nsACString& aFilename, |