summaryrefslogtreecommitdiffstats
path: root/tools/profiler/lul
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-12 16:19:33 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-12 16:19:58 +0200
commit6571d2ceb42930dab01677ef0e95e732d5076fb8 (patch)
tree8c593b8e09f2cfb457df72d40dc719bb0e0df066 /tools/profiler/lul
parent2f359ed80ccb2cab440c0cda886404ed42ad9fdf (diff)
downloadUXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar
UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.gz
UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.lz
UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.xz
UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.zip
Remove MOZ_WIDGET_GONK [1/2]
Tag #288
Diffstat (limited to 'tools/profiler/lul')
-rw-r--r--tools/profiler/lul/AutoObjectMapper.cpp6
-rw-r--r--tools/profiler/lul/AutoObjectMapper.h4
-rw-r--r--tools/profiler/lul/platform-linux-lul.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/profiler/lul/AutoObjectMapper.cpp b/tools/profiler/lul/AutoObjectMapper.cpp
index a5dc902fd..1bc5ce62a 100644
--- a/tools/profiler/lul/AutoObjectMapper.cpp
+++ b/tools/profiler/lul/AutoObjectMapper.cpp
@@ -16,7 +16,7 @@
#include "PlatformMacros.h"
#include "AutoObjectMapper.h"
-#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
+#if defined(SPS_OS_android)
# include <dlfcn.h>
# include "mozilla/Types.h"
// FIXME move these out of mozglue/linker/ElfLoader.h into their
@@ -108,7 +108,7 @@ bool AutoObjectMapperPOSIX::Map(/*OUT*/void** start, /*OUT*/size_t* length,
}
-#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
+#if defined(SPS_OS_android)
// A helper function for AutoObjectMapperFaultyLib::Map. Finds out
// where the installation's lib directory is, since we'll have to look
// in there to get hold of libmozglue.so. Returned C string is heap
@@ -204,4 +204,4 @@ bool AutoObjectMapperFaultyLib::Map(/*OUT*/void** start, /*OUT*/size_t* length,
}
}
-#endif // defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
+#endif // defined(SPS_OS_android)
diff --git a/tools/profiler/lul/AutoObjectMapper.h b/tools/profiler/lul/AutoObjectMapper.h
index 1f813d6f2..3f60dc44d 100644
--- a/tools/profiler/lul/AutoObjectMapper.h
+++ b/tools/profiler/lul/AutoObjectMapper.h
@@ -62,7 +62,7 @@ private:
};
-#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
+#if defined(SPS_OS_android)
// This is a variant of AutoObjectMapperPOSIX suitable for use in
// conjunction with faulty.lib on Android. How it behaves depends on
// the name of the file to be mapped. There are three possible cases:
@@ -110,6 +110,6 @@ private:
void operator delete[](void*);
};
-#endif // defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
+#endif // defined(SPS_OS_android)
#endif // AutoObjectMapper_h
diff --git a/tools/profiler/lul/platform-linux-lul.cpp b/tools/profiler/lul/platform-linux-lul.cpp
index 9541534a1..da764f3cf 100644
--- a/tools/profiler/lul/platform-linux-lul.cpp
+++ b/tools/profiler/lul/platform-linux-lul.cpp
@@ -32,7 +32,7 @@ read_procmaps(lul::LUL* aLUL)
for (size_t i = 0; i < info.GetSize(); i++) {
const SharedLibrary& lib = info.GetEntry(i);
-# if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
+# if defined(SPS_OS_android)
// We're using faulty.lib. Use a special-case object mapper.
AutoObjectMapperFaultyLib mapper(aLUL->mLog);
# else