| commit | 703237a5b0226e98230cd85cf7f14b818df961a5 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Feb 03 21:14:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 03 21:14:13 2015 +0000 |
| tree | 38d4cba87ef3589422426235c821254e30c47612 | |
| parent | 813d0ac13614b6199f407762f679afc9f439be7e [diff] | |
| parent | 6c6f39678cf41a52826b4b4551f39d8256855f54 [diff] |
am 6c6f3967: Merge "Fix Mac build." * commit '6c6f39678cf41a52826b4b4551f39d8256855f54': Fix Mac build.
diff --git a/libutils/file.cpp b/libutils/file.cpp index 15bda7f..aa35ff2 100644 --- a/libutils/file.cpp +++ b/libutils/file.cpp
@@ -21,6 +21,8 @@ #include <sys/stat.h> #include <sys/types.h> +#include <utils/Compat.h> // For TEMP_FAILURE_RETRY on Darwin. + bool android::ReadFileToString(const std::string& path, std::string* content) { content->clear();