Upstream android string implementation etc.

base/sys_string_conversions_linux.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/sys_string_conversions.h"
 
 #include <wchar.h>
 
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 
 namespace base {
 
 std::string SysWideToUTF8(const std::wstring& wide) {
   // In theory this should be using the system-provided conversion rather
   // than our ICU, but this will do for now.
   return WideToUTF8(wide);
 }
 std::wstring SysUTF8ToWide(const StringPiece& utf8) {
   // In theory this should be using the system-provided conversion rather
   // than our ICU, but this will do for now.
   std::wstring out;
   UTF8ToWide(utf8.data(), utf8.size(), &out);
   return out;
 }
 
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
+// TODO(port): Consider reverting the OS_ANDROID when we have wcrtomb()
+// support and a better understanding of what calls these routines.
 
 // ChromeOS always runs in UTF-8 locale.
 std::string SysWideToNativeMB(const std::wstring& wide) {
   return WideToUTF8(wide);
 }
 
 std::wstring SysNativeMBToWide(const StringPiece& native_mb) {
   return SysUTF8ToWide(native_mb);
 }
 
@@ skipping 112 matching lines @@
         break;
     }
   }
 
   return out;
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace base