diff options
author | Elliott Hughes <enh@google.com> | 2015-11-11 18:02:29 +0000 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2015-11-11 18:23:00 -0800 |
commit | c1fd492ac5c14a42acfbbd9b47ed178fbf1378d3 (patch) | |
tree | 73a610a40d14d6070073550327c34470273b0b50 /base/file.cpp | |
parent | 524716889bb619e7604910cbb13864516d5e1467 (diff) | |
download | system_core-c1fd492ac5c14a42acfbbd9b47ed178fbf1378d3.tar.gz system_core-c1fd492ac5c14a42acfbbd9b47ed178fbf1378d3.tar.bz2 system_core-c1fd492ac5c14a42acfbbd9b47ed178fbf1378d3.zip |
Revert "Revert "adb/base: fix adb push of Unicode filenames on Win32""
This reverts commit cc8cd59456ca485a51cd6fd388c8bcb1af4a8f9b.
With the dependency on libcutils (for gettid for non-bionic) removed,
this no longer breaks the build.
Change-Id: I645bd6876e2502ddc1535b69af1e645c0df9d178
Diffstat (limited to 'base/file.cpp')
-rw-r--r-- | base/file.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/base/file.cpp b/base/file.cpp index 3468dcfbf..7b5e7b13d 100644 --- a/base/file.cpp +++ b/base/file.cpp @@ -24,6 +24,7 @@ #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" @@ -35,6 +36,9 @@ 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(); |