summaryrefslogtreecommitdiffstats
path: root/xpcom/base
diff options
context:
space:
mode:
Diffstat (limited to 'xpcom/base')
-rw-r--r--xpcom/base/nsMemoryReporterManager.cpp4
-rw-r--r--xpcom/base/nsSystemInfo.cpp44
2 files changed, 0 insertions, 48 deletions
diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
index 616eefbdc..7c62e2af5 100644
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -1596,10 +1596,6 @@ nsMemoryReporterManager::~nsMemoryReporterManager()
NS_ASSERTION(!mSavedWeakReporters, "failed to restore weak reporters");
}
-#ifdef MOZ_WIDGET_GONK
-#define DEBUG_CHILD_PROCESS_MEMORY_REPORTING 1
-#endif
-
#ifdef DEBUG_CHILD_PROCESS_MEMORY_REPORTING
#define MEMORY_REPORTING_LOG(format, ...) \
printf_stderr("++++ MEMORY REPORTING: " format, ##__VA_ARGS__);
diff --git a/xpcom/base/nsSystemInfo.cpp b/xpcom/base/nsSystemInfo.cpp
index a72dd3826..4a92a2eb4 100644
--- a/xpcom/base/nsSystemInfo.cpp
+++ b/xpcom/base/nsSystemInfo.cpp
@@ -50,12 +50,6 @@
#include "mozilla/dom/ContentChild.h"
#endif
-#ifdef MOZ_WIDGET_GONK
-#include <sys/system_properties.h>
-#include "mozilla/Preferences.h"
-#include "nsPrintfCString.h"
-#endif
-
#ifdef ANDROID
extern "C" {
NS_EXPORT int android_sdk_version;
@@ -747,44 +741,6 @@ nsSystemInfo::Init()
}
#endif
-#ifdef MOZ_WIDGET_GONK
- char sdk[PROP_VALUE_MAX];
- if (__system_property_get("ro.build.version.sdk", sdk)) {
- android_sdk_version = atoi(sdk);
- SetPropertyAsInt32(NS_LITERAL_STRING("sdk_version"), android_sdk_version);
-
- SetPropertyAsACString(NS_LITERAL_STRING("secondaryLibrary"),
- nsPrintfCString("SDK %u", android_sdk_version));
- }
-
- char characteristics[PROP_VALUE_MAX];
- if (__system_property_get("ro.build.characteristics", characteristics)) {
- if (!strcmp(characteristics, "tablet")) {
- SetPropertyAsBool(NS_LITERAL_STRING("tablet"), true);
- } else if (!strcmp(characteristics, "tv")) {
- SetPropertyAsBool(NS_LITERAL_STRING("tv"), true);
- }
- }
-
- nsAutoString str;
- rv = GetPropertyAsAString(NS_LITERAL_STRING("version"), str);
- if (NS_SUCCEEDED(rv)) {
- SetPropertyAsAString(NS_LITERAL_STRING("kernel_version"), str);
- }
-
- const nsAdoptingString& b2g_os_name =
- mozilla::Preferences::GetString("b2g.osName");
- if (b2g_os_name) {
- SetPropertyAsAString(NS_LITERAL_STRING("name"), b2g_os_name);
- }
-
- const nsAdoptingString& b2g_version =
- mozilla::Preferences::GetString("b2g.version");
- if (b2g_version) {
- SetPropertyAsAString(NS_LITERAL_STRING("version"), b2g_version);
- }
-#endif
-
return NS_OK;
}