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

Commit 67604660 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "base: adb.exe build error"

parents 718899b4 0c071c9d

base/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ cc_library { 
        support_system_process: true,

    },

    srcs: [

        "chrono_utils.cpp",

        "file.cpp",

        "logging.cpp",

        "parsenetaddress.cpp",
@@ -72,14 +73,12 @@ cc_library { 
        },

        linux: {

            srcs: [

                "chrono_utils.cpp",

                "errors_unix.cpp",

            ],

            cppflags: ["-Wexit-time-destructors"],

        },

        darwin: {

            srcs: [

                "chrono_utils.cpp",

                "errors_unix.cpp",

            ],

            cppflags: ["-Wexit-time-destructors"],

base/chrono_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ boot_clock::time_point boot_clock::now() { 
  return boot_clock::time_point(std::chrono::seconds(ts.tv_sec) +

                                std::chrono::nanoseconds(ts.tv_nsec));

#else

  // Darwin does not support clock_gettime.

  // Darwin and Windows do not support clock_gettime.

  return boot_clock::time_point();

#endif  // __linux__

}

base/include/android-base/chrono_utils.h

+2 −0
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ 
#include <chrono>

#include <sstream>



#if __cplusplus > 201103L  // C++14

using namespace std::chrono_literals;

#endif



namespace android {

namespace base {