commit 33858a37b0aebf19bad51e664b5238f57f95af4c
author John Park <johnhenryp@icloud.com> Fri Sep 28 23:05:48 2018 -0700
committer John Park <johnhenryp@icloud.com> Sat Oct 13 19:36:22 2018 -0700
tree abc7fdd2817cd432500e4dd689a7dfcd1055f8ec
parent db4e8e58ee12c58d663ff152b5f6f6f55fb948b2

Removed Common

Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303

aos/events/BUILD

diff --git a/aos/events/BUILD b/aos/events/BUILD
index d2108a8..ad888f6 100644
--- a/aos/events/BUILD
+++ b/aos/events/BUILD
@@ -3,8 +3,8 @@
   name = "raw-event-loop",
   hdrs = ["raw-event-loop.h"],
   deps = [
-    "//aos/common:time",
-    "//aos/common:queues",
+    "//aos/time:time",
+    "//aos:queues",
   ],
 )
 
@@ -14,8 +14,8 @@
   srcs = ["event-loop-tmpl.h"],
   deps = [
     ":raw-event-loop",
-    "//aos/common:time",
-    "//aos/common:queues",
+    "//aos/time:time",
+    "//aos:queues",
   ],
 )
 
@@ -25,8 +25,8 @@
   srcs = ["shm-event-loop.cc"],
   deps = [
     ":event-loop",
-    "//aos/common:queues",
-    "//aos/common/logging:logging",
+    "//aos:queues",
+    "//aos/logging:logging",
   ],
 )
 
@@ -68,7 +68,7 @@
   srcs = ["simulated-event-loop.cc"],
   deps = [
     ":event-loop",
-    "//aos/common:queues",
+    "//aos:queues",
   ],
 )
 

aos/events/event-loop.h

diff --git a/aos/events/event-loop.h b/aos/events/event-loop.h
index d3cbf3f..57ff49b 100644
--- a/aos/events/event-loop.h
+++ b/aos/events/event-loop.h
@@ -2,8 +2,8 @@
 #define _AOS_EVENTS_EVENT_LOOP_H_
 
 #include <string>
-#include "aos/common/queue.h"
-#include "aos/common/time.h"
+#include "aos/queue.h"
+#include "aos/time/time.h"
 #include "aos/events/raw-event-loop.h"
 
 namespace aos {

aos/events/raw-event-loop.h

diff --git a/aos/events/raw-event-loop.h b/aos/events/raw-event-loop.h
index 9b1408d..ffc894b 100644
--- a/aos/events/raw-event-loop.h
+++ b/aos/events/raw-event-loop.h
@@ -4,8 +4,8 @@
 #include <atomic>
 #include <memory>
 #include <string>
-#include "aos/common/queue.h"
-#include "aos/common/time.h"
+#include "aos/queue.h"
+#include "aos/time/time.h"
 
 // This file contains raw versions of the classes in event-loop.h.
 //

aos/events/shm-event-loop.cc

diff --git a/aos/events/shm-event-loop.cc b/aos/events/shm-event-loop.cc
index 832b27b..6231df2 100644
--- a/aos/events/shm-event-loop.cc
+++ b/aos/events/shm-event-loop.cc
@@ -1,6 +1,6 @@
 #include "aos/events/shm-event-loop.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/queue.h"
+#include "aos/logging/logging.h"
+#include "aos/queue.h"
 
 #include <sys/timerfd.h>
 #include <atomic>

aos/events/shm-event-loop.h

diff --git a/aos/events/shm-event-loop.h b/aos/events/shm-event-loop.h
index 3b36f40..9bbdb42 100644
--- a/aos/events/shm-event-loop.h
+++ b/aos/events/shm-event-loop.h
@@ -1,7 +1,7 @@
 #include <unordered_set>
 #include <vector>
-#include "aos/common/condition.h"
-#include "aos/common/mutex.h"
+#include "aos/condition.h"
+#include "aos/mutex/mutex.h"
 #include "aos/events/event-loop.h"
 
 namespace aos {
@@ -13,7 +13,7 @@
 }  // namespace internal
 
 // Specialization of EventLoop that is built from queues running out of shared
-// memory. See more details at aos/common/queue.h
+// memory. See more details at aos/queue.h
 class ShmEventLoop : public EventLoop {
  public:
   ShmEventLoop();

aos/events/simulated-event-loop.cc

diff --git a/aos/events/simulated-event-loop.cc b/aos/events/simulated-event-loop.cc
index 90b78cd..efce9ab 100644
--- a/aos/events/simulated-event-loop.cc
+++ b/aos/events/simulated-event-loop.cc
@@ -1,5 +1,5 @@
 #include "aos/events/simulated-event-loop.h"
-#include "aos/common/queue.h"
+#include "aos/queue.h"
 
 namespace aos {
 namespace {