Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70b0e94f authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

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

am: 337b4dd6

Change-Id: I929930dbe7e013d8be608b06c76b5af33b527351
parents 27d54dd4 337b4dd6

base/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -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"],

base/file.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -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;

  }

  }