2 files changed, 10 insertions, 63 deletions
diff --git a/intl/locale/unix/moz.build b/intl/locale/unix/moz.build
index 68a151b656..42ea11a697 100644
--- a/intl/locale/unix/moz.build
+++ b/intl/locale/unix/moz.build
@@ -9,20 +9,15 @@ SOURCES += [
     'nsPosixLocale.cpp',
 ]
 
-if CONFIG['OS_TARGET'] == 'Android':
-    SOURCES += [
-        'nsAndroidCharset.cpp',
-    ]
-else:
-    SOURCES += [
-        'nsUNIXCharset.cpp',
-    ]
-    GENERATED_FILES = [
-        'unixcharset.properties.h',
-    ]
-    unixcharset = GENERATED_FILES['unixcharset.properties.h']
-    unixcharset.script = '../props2arrays.py'
-    unixcharset.inputs = ['unixcharset.properties']
+SOURCES += [
+    'nsUNIXCharset.cpp',
+]
+GENERATED_FILES = [
+    'unixcharset.properties.h',
+]
+unixcharset = GENERATED_FILES['unixcharset.properties.h']
+unixcharset.script = '../props2arrays.py'
+unixcharset.inputs = ['unixcharset.properties']
 
 FINAL_LIBRARY = 'xul'
 
@@ -31,6 +26,7 @@ LOCAL_INCLUDES += [
 ]
 
 # CODESET is not automatically defined on some older versions of Redhat.
+# XXXMC: Which ones? Do we still support those older versions?
 # Define _XOPEN_SOURCE so CODESET will get defined and thus allow
 # nl_langinfo(CODESET) to compile on these systems.
 if CONFIG['OS_ARCH'] == 'Linux':
diff --git a/intl/locale/unix/nsAndroidCharset.cpp b/intl/locale/unix/nsAndroidCharset.cpp
deleted file mode 100644
index ed646039c6..0000000000
--- a/intl/locale/unix/nsAndroidCharset.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsIPlatformCharset.h"
-#include "nsPlatformCharset.h"
-
-NS_IMPL_ISUPPORTS(nsPlatformCharset, nsIPlatformCharset)
-
-nsPlatformCharset::nsPlatformCharset()
-{
-}
-
-nsPlatformCharset::~nsPlatformCharset()
-{
-}
-
-NS_IMETHODIMP 
-nsPlatformCharset::Init()
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsACString& oResult)
-{
-  oResult.AssignLiteral("UTF-8");
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsPlatformCharset::GetDefaultCharsetForLocale(const nsAString& localeName, nsACString &oResult)
-{
-  oResult.AssignLiteral("UTF-8");
-  return NS_OK;
-}
-
-nsresult
-nsPlatformCharset::InitGetCharset(nsACString &oString)
-{
-  return NS_OK;
-}
-
-nsresult
-nsPlatformCharset::VerifyCharset(nsCString &aCharset)
-{
-  return NS_OK;
-}