commit 2c4fdd0efc5589cb2a8ed8874994da768b17c383
author Elliott Hughes <enh@google.com> Tue May 16 18:06:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 18:06:07 2017 +0000
tree 88b52a2ef1c8c8a4193aef39dd56fdcac8165180
parent c3f60bf83d3825a7e7ab7b11bb6f7e60984612b7
parent a818853477eab89cb359de3e2b15f278bd1e6bfc

Merge "Remove libbase's trivial libutils-headers dependency." am: 337b4dd661 am: 70b0e94f80
am: 97caf43fbc

Change-Id: I130d4c518160d7d30353b8ca8c62339440b9ac6d

base/Android.bp

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

base/file.cpp

diff --git a/base/file.cpp b/base/file.cpp
index 7fbebc5..a2f2887 100644
--- a/base/file.cpp
+++ b/base/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;
   }