Remove easy uses of //aos/mutex
I was hoping to get rid of it completely as one of the nontrivial users
of AOS_LOG, but need to write a compatible condition variable first.
Change-Id: I86c1c4084882bf789baabd0255e115d821154830
diff --git a/aos/logging/BUILD b/aos/logging/BUILD
index 45a9921..a9fcb14 100644
--- a/aos/logging/BUILD
+++ b/aos/logging/BUILD
@@ -23,10 +23,10 @@
"//aos:macros",
"//aos:thread_local",
"//aos/libc:aos_strerror",
- "//aos/mutex",
"//aos/stl_mutex",
"//aos/time",
"//aos/type_traits",
+ "@com_github_google_glog//:glog",
"@com_google_absl//absl/base",
],
)
@@ -59,6 +59,7 @@
":implementations",
":logging",
"//aos/testing:googletest",
+ "@com_github_google_glog//:glog",
],
)
diff --git a/aos/logging/context.cc b/aos/logging/context.cc
index 0628e0e..0aa3e71 100644
--- a/aos/logging/context.cc
+++ b/aos/logging/context.cc
@@ -11,14 +11,15 @@
#include <sys/prctl.h>
#include <sys/types.h>
#include <unistd.h>
+#include <errno.h>
#include <string>
-#include <errno.h>
-
extern char *program_invocation_name;
extern char *program_invocation_short_name;
+#include "glog/logging.h"
+
#include "aos/complex_thread_local.h"
#include "aos/die.h"
#include "aos/logging/implementations.h"
diff --git a/aos/logging/implementations.h b/aos/logging/implementations.h
index 6395c37..bcce421 100644
--- a/aos/logging/implementations.h
+++ b/aos/logging/implementations.h
@@ -19,7 +19,6 @@
#include "aos/logging/logging.h"
#include "aos/logging/sizes.h"
#include "aos/macros.h"
-#include "aos/mutex/mutex.h"
#include "aos/time/time.h"
#include "aos/type_traits/type_traits.h"
diff --git a/aos/logging/implementations_test.cc b/aos/logging/implementations_test.cc
index 058baab..6b85358 100644
--- a/aos/logging/implementations_test.cc
+++ b/aos/logging/implementations_test.cc
@@ -7,6 +7,8 @@
#include "aos/logging/printf_formats.h"
#include "aos/time/time.h"
+
+#include "glog/logging.h"
#include "gtest/gtest.h"
using ::testing::AssertionFailure;