Bug 1345762 - Rename OSPreferences_unix.cpp to OSPreferences_android.cpp. r=gandalf

OSPreferences_unix.cpp is used on Android only.  So we should rename it to OSPreferences_android.cpp
Also, we should create android directory into intl/locale, then move OSPreferences_android.cpp and nsAndroidCharset.cpp into it.

MozReview-Commit-ID: 2CUbV1Yc2fu

--HG--
rename : intl/locale/unix/OSPreferences_unix.cpp => intl/locale/android/OSPreferences_android.cpp
rename : intl/locale/unix/nsAndroidCharset.cpp => intl/locale/android/nsAndroidCharset.cpp
extra : rebase_source : f677428cc899c767e784b9f2c793b84e3fd95c11

intl/locale/android/moz.build

@@ -0,0 +1,16 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+UNIFIED_SOURCES += [
+    'nsAndroidCharset.cpp',
+    'OSPreferences_android.cpp'
+]
+
+FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '..',
+]

intl/locale/moz.build

@@ -16,6 +16,8 @@ else:
     DIRS += ['unix']
     if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
         DIRS += ['gtk']
+    elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+        DIRS += ['android']
 
 XPIDL_SOURCES += [
     'mozILocaleService.idl',

intl/locale/unix/moz.build

@@ -9,14 +9,7 @@ SOURCES += [
     'nsPosixLocale.cpp',
 ]
 
-if 'gtk' not in CONFIG['MOZ_WIDGET_TOOLKIT']:
-    SOURCES += ['OSPreferences_unix.cpp']
-
-if CONFIG['OS_TARGET'] == 'Android':
-    SOURCES += [
-        'nsAndroidCharset.cpp',
-    ]
-else:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     SOURCES += [
         'nsUNIXCharset.cpp',
     ]