commit 30a3b92c0e61be2b2b8c433e639e2bf522f9930b
author Steven Moreland <smoreland@google.com> Mon Sep 23 16:23:06 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 23 16:23:06 2019 +0000
tree e7ecf402be4cc534e17710ddfa51753f927bcb7f
parent fc48a62d4c6c7d9ac191d3132e3152e6c1612625
parent 1cb99ea59b76a8d0f236f5220ef428ae4dfe0e67

Merge "libutils: Trace.h for everything but windows"

libutils/include/utils/Trace.h

diff --git a/libutils/include/utils/Trace.h b/libutils/include/utils/Trace.h
index 4b9c91e..fec0ffa 100644
--- a/libutils/include/utils/Trace.h
+++ b/libutils/include/utils/Trace.h
@@ -17,7 +17,12 @@
 #ifndef ANDROID_TRACE_H
 #define ANDROID_TRACE_H
 
-#if defined(__ANDROID__)
+#if defined(_WIN32)
+
+#define ATRACE_NAME(...)
+#define ATRACE_CALL()
+
+#else  // !_WIN32
 
 #include <stdint.h>
 
@@ -51,11 +56,6 @@
 
 }  // namespace android
 
-#else // !__ANDROID__
-
-#define ATRACE_NAME(...)
-#define ATRACE_CALL()
-
-#endif // __ANDROID__
+#endif  // _WIN32
 
 #endif // ANDROID_TRACE_H