diff options
author | Elliott Hughes <enh@google.com> | 2015-11-11 18:01:12 +0000 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2015-11-11 18:01:12 +0000 |
commit | cc8cd59456ca485a51cd6fd388c8bcb1af4a8f9b (patch) | |
tree | a6deb6693f856e7ebc18e472cb9e0fdf904bada4 /base/file.cpp | |
parent | ac9514a4524f98b2029dbcda9326a763d25492b1 (diff) | |
download | system_core-cc8cd59456ca485a51cd6fd388c8bcb1af4a8f9b.tar.gz system_core-cc8cd59456ca485a51cd6fd388c8bcb1af4a8f9b.tar.bz2 system_core-cc8cd59456ca485a51cd6fd388c8bcb1af4a8f9b.zip |
Revert "adb/base: fix adb push of Unicode filenames on Win32"
This reverts commit ac9514a4524f98b2029dbcda9326a763d25492b1.
The new gettid dependency caused other breakage.
Change-Id: I74a75e40c30a45beb275f9dd38eb5c7beac15fbd
Diffstat (limited to 'base/file.cpp')
-rw-r--r-- | base/file.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/base/file.cpp b/base/file.cpp index 7b5e7b13d..3468dcfbf 100644 --- a/base/file.cpp +++ b/base/file.cpp @@ -24,7 +24,6 @@ #include <string> #include "base/macros.h" // For TEMP_FAILURE_RETRY on Darwin. -#include "base/utf8.h" #define LOG_TAG "base.file" #include "cutils/log.h" #include "utils/Compat.h" @@ -36,9 +35,6 @@ namespace android { namespace base { -// Versions of standard library APIs that support UTF-8 strings. -using namespace android::base::utf8; - bool ReadFdToString(int fd, std::string* content) { content->clear(); |