diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2018-02-05 07:41:31 -0800 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2018-02-05 09:33:10 -0800 |
| commit | 0c071c9de7aa40301cfc945f08d1783f2831ee5c (patch) | |
| tree | e5182c884c4b4e1afe155556ab2c0a507e5faf76 | |
| parent | 7c271bdc3b240779ad78ab379ae98925785fac70 (diff) | |
| download | system_core-0c071c9de7aa40301cfc945f08d1783f2831ee5c.tar.gz system_core-0c071c9de7aa40301cfc945f08d1783f2831ee5c.tar.bz2 system_core-0c071c9de7aa40301cfc945f08d1783f2831ee5c.zip | |
base: adb.exe build error
Windows build of adb is broken because of the lack of
std::chrono_literals and for an implementation of
android::boot_clock::now().
Test: make -j vts
Bug: 72941624
Change-Id: Ie65fed098633eb45a94ea553de6903f8d55fc5b2
| -rw-r--r-- | base/Android.bp | 3 | ||||
| -rw-r--r-- | base/chrono_utils.cpp | 2 | ||||
| -rw-r--r-- | base/include/android-base/chrono_utils.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/base/Android.bp b/base/Android.bp index 01800afad..6cadcfc0f 100644 --- a/base/Android.bp +++ b/base/Android.bp @@ -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"], diff --git a/base/chrono_utils.cpp b/base/chrono_utils.cpp index dbe54830f..19080a5a7 100644 --- a/base/chrono_utils.cpp +++ b/base/chrono_utils.cpp @@ -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__ } diff --git a/base/include/android-base/chrono_utils.h b/base/include/android-base/chrono_utils.h index 7679d4c94..c3396ee2f 100644 --- a/base/include/android-base/chrono_utils.h +++ b/base/include/android-base/chrono_utils.h @@ -20,7 +20,9 @@ #include <chrono> #include <sstream> +#if __cplusplus > 201103L // C++14 using namespace std::chrono_literals; +#endif namespace android { namespace base { |