commit 62ecbaa62cc91f278331d9144c798b8946c70bff
author Elliott Hughes <enh@google.com> Mon May 15 17:31:15 2017 -0700
committer Elliott Hughes <enh@google.com> Mon May 15 17:31:15 2017 -0700
tree 08797e79fdb21357d5b39b0fe00dd5943fa9860d
parent 2e1e999adf875a5309c5e26eef1c955545e372a3

Remove libbase's trivial libutils-headers dependency.

Bug: N/A
Test: builds
Change-Id: I59eb464a0127564a42775bf19b516ad8a53ee235

Android.bp

diff --git a/Android.bp b/Android.bp
index 81b96db..b636dc3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,7 +53,6 @@
 
     header_libs: [
         "libbase_headers",
-        "libutils_headers",
     ],
     export_header_lib_headers: ["libbase_headers"],
 

file.cpp

diff --git a/file.cpp b/file.cpp
index 7fbebc5..a2f2887 100644
--- a/file.cpp
+++ b/file.cpp
@@ -32,13 +32,14 @@
 #include "android-base/macros.h"  // For TEMP_FAILURE_RETRY on Darwin.
 #include "android-base/unique_fd.h"
 #include "android-base/utf8.h"
-#include "utils/Compat.h"
 
 #if defined(__APPLE__)
 #include <mach-o/dyld.h>
 #endif
 #if defined(_WIN32)
 #include <windows.h>
+#define O_CLOEXEC O_NOINHERIT
+#define O_NOFOLLOW 0
 #endif
 
 namespace android {
@@ -133,7 +134,7 @@
                        bool follow_symlinks) {
   int flags = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_BINARY |
               (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) {
     return false;
   }