commit 0b35b18f88ebeb8f3cb2291c239dd2cb3732d0cc
author Josh Gao <jmgao@google.com> Mon May 01 21:56:28 2017 +0000
committer Josh Gao <jmgao@google.com> Mon May 01 21:56:28 2017 +0000
tree 9cb22353e91afbd4bbdb0a0a1be99c032c55d3cd
parent ae29339ca138648eeaee68f801feb02d85ee2abf

Revert "base: make boot_clock work on host linux, hide it on non-linux."

This reverts commit ae29339ca138648eeaee68f801feb02d85ee2abf, which broke the darwin build.

Change-Id: Ib33e2dab197532f04944cb12151002e9219b1bb5

base/Android.bp

diff --git a/base/Android.bp b/base/Android.bp
index 14bfe36..81b96db 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -42,7 +42,6 @@
     clang: true,
     host_supported: true,
     srcs: [
-        "chrono_utils.cpp",
         "file.cpp",
         "logging.cpp",
         "parsenetaddress.cpp",
@@ -65,6 +64,7 @@
             srcs: [
                 "errors_unix.cpp",
                 "properties.cpp",
+                "chrono_utils.cpp",
             ],
             cppflags: ["-Wexit-time-destructors"],
             sanitize: {
@@ -74,12 +74,14 @@
         },
         darwin: {
             srcs: [
+                "chrono_utils.cpp",
                 "errors_unix.cpp",
             ],
             cppflags: ["-Wexit-time-destructors"],
         },
         linux_bionic: {
             srcs: [
+                "chrono_utils.cpp",
                 "errors_unix.cpp",
             ],
             cppflags: ["-Wexit-time-destructors"],
@@ -87,6 +89,7 @@
         },
         linux: {
             srcs: [
+                "chrono_utils.cpp",
                 "errors_unix.cpp",
             ],
             cppflags: ["-Wexit-time-destructors"],