ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove libbase's trivial libutils-headers dependency."

Browse source
This commit is contained in:
Treehugger Robot 2017-05-16 17:51:12 +00:00 • committed by Gerrit Code Review
commit 337b4dd661
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
base/Android.bp
View file

@ -53,7 +53,6 @@ cc_library {
header_libs: [ header_libs: [
"libbase_headers", "libbase_headers",
"libutils_headers",
], ],
export_header_lib_headers: ["libbase_headers"], export_header_lib_headers: ["libbase_headers"],

5
base/file.cpp
View file

@ -32,13 +32,14 @@
#include "android-base/macros.h" // For TEMP_FAILURE_RETRY on Darwin. #include "android-base/macros.h" // For TEMP_FAILURE_RETRY on Darwin.
#include "android-base/unique_fd.h" #include "android-base/unique_fd.h"
#include "android-base/utf8.h" #include "android-base/utf8.h"
#include "utils/Compat.h"
#if defined(__APPLE__) #if defined(__APPLE__)
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)
#include <windows.h> #include <windows.h>
#define O_CLOEXEC O_NOINHERIT
#define O_NOFOLLOW 0
#endif #endif
namespace android { namespace android {
@ -133,7 +134,7 @@ bool WriteStringToFile(const std::string& content, const std::string& path,
bool follow_symlinks) { bool follow_symlinks) {
int flags = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_BINARY | int flags = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_BINARY |
(follow_symlinks ? 0 : O_NOFOLLOW); (follow_symlinks ? 0 : O_NOFOLLOW);
android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path.c_str(), flags, DEFFILEMODE))); android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path.c_str(), flags, 0666)));
if (fd == -1) { if (fd == -1) {
return false; return false;
} }