Removed Common
Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/aos/vision/blob/BUILD b/aos/vision/blob/BUILD
index e1255c8..bc1e7f0 100644
--- a/aos/vision/blob/BUILD
+++ b/aos/vision/blob/BUILD
@@ -25,7 +25,7 @@
"//tools:armhf-debian",
],
deps = [
- "//aos/common/logging",
+ "//aos/logging",
],
)
diff --git a/aos/vision/blob/region_alloc.h b/aos/vision/blob/region_alloc.h
index 4bc4156..8c7bc57 100644
--- a/aos/vision/blob/region_alloc.h
+++ b/aos/vision/blob/region_alloc.h
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
namespace aos {
namespace vision {
diff --git a/aos/vision/debug/BUILD b/aos/vision/debug/BUILD
index 06f5d0b..bb03a75 100644
--- a/aos/vision/debug/BUILD
+++ b/aos/vision/debug/BUILD
@@ -43,9 +43,9 @@
"//tools:armhf-debian",
],
deps = [
- "//aos/common/logging",
- "//aos/common/logging:implementations",
- "//aos/common/util:global_factory",
+ "//aos/logging",
+ "//aos/logging:implementations",
+ "//aos/util:global_factory",
"//aos/vision/blob:codec",
"//aos/vision/blob:find_blob",
"//aos/vision/blob:range_image",
diff --git a/aos/vision/debug/debug_framework.cc b/aos/vision/debug/debug_framework.cc
index d4ba0d2..46f5400 100644
--- a/aos/vision/debug/debug_framework.cc
+++ b/aos/vision/debug/debug_framework.cc
@@ -2,8 +2,8 @@
#include <gtk/gtk.h>
-#include "aos/common/logging/implementations.h"
-#include "aos/common/logging/logging.h"
+#include "aos/logging/implementations.h"
+#include "aos/logging/logging.h"
#include "aos/vision/blob/find_blob.h"
#include "aos/vision/blob/stream_view.h"
#include "aos/vision/events/epoll_events.h"
diff --git a/aos/vision/debug/debug_framework.h b/aos/vision/debug/debug_framework.h
index e838913..d5b345f 100644
--- a/aos/vision/debug/debug_framework.h
+++ b/aos/vision/debug/debug_framework.h
@@ -1,7 +1,7 @@
#ifndef _AOS_VISION_DEBUG_DEBUG_FRAMEWORK_H_
#define _AOS_VISION_DEBUG_DEBUG_FRAMEWORK_H_
-#include "aos/common/util/global_factory.h"
+#include "aos/util/global_factory.h"
#include "aos/vision/blob/range_image.h"
#include "aos/vision/events/epoll_events.h"
#include "aos/vision/image/camera_params.pb.h"
diff --git a/aos/vision/events/BUILD b/aos/vision/events/BUILD
index b3affc2..359822c 100644
--- a/aos/vision/events/BUILD
+++ b/aos/vision/events/BUILD
@@ -10,9 +10,9 @@
"//tools:armhf-debian",
],
deps = [
- "//aos/common:scoped_fd",
- "//aos/common:time",
- "//aos/common/logging",
+ "//aos/scoped:scoped_fd",
+ "//aos/time:time",
+ "//aos/logging",
],
)
@@ -68,8 +68,8 @@
"//tools:armhf-debian",
],
deps = [
- "//aos/common:macros",
- "//aos/common:scoped_fd",
+ "//aos:macros",
+ "//aos/scoped:scoped_fd",
],
)
diff --git a/aos/vision/events/epoll_events.cc b/aos/vision/events/epoll_events.cc
index b0c66fa..0043b78 100644
--- a/aos/vision/events/epoll_events.cc
+++ b/aos/vision/events/epoll_events.cc
@@ -7,7 +7,7 @@
#include <sys/types.h>
#include <vector>
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
namespace aos {
namespace events {
diff --git a/aos/vision/events/epoll_events.h b/aos/vision/events/epoll_events.h
index 234d949..19851ed 100644
--- a/aos/vision/events/epoll_events.h
+++ b/aos/vision/events/epoll_events.h
@@ -7,8 +7,8 @@
#include <vector>
#include <sys/epoll.h>
-#include "aos/common/scoped_fd.h"
-#include "aos/common/time.h"
+#include "aos/scoped/scoped_fd.h"
+#include "aos/time/time.h"
namespace aos {
namespace events {
diff --git a/aos/vision/events/tcp_client.cc b/aos/vision/events/tcp_client.cc
index 4ac45af..8e197ec 100644
--- a/aos/vision/events/tcp_client.cc
+++ b/aos/vision/events/tcp_client.cc
@@ -13,7 +13,7 @@
#include <unistd.h>
#include <unistd.h>
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
namespace aos {
namespace events {
diff --git a/aos/vision/events/tcp_server.cc b/aos/vision/events/tcp_server.cc
index 06f3a41..0fd7225 100644
--- a/aos/vision/events/tcp_server.cc
+++ b/aos/vision/events/tcp_server.cc
@@ -13,7 +13,7 @@
#include <sys/types.h>
#include <unistd.h>
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
namespace aos {
namespace events {
diff --git a/aos/vision/events/udp.cc b/aos/vision/events/udp.cc
index 660342c..ed39db9 100644
--- a/aos/vision/events/udp.cc
+++ b/aos/vision/events/udp.cc
@@ -2,7 +2,7 @@
#include <string.h>
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
namespace aos {
namespace events {
diff --git a/aos/vision/events/udp.h b/aos/vision/events/udp.h
index 9a23dab..503ead1 100644
--- a/aos/vision/events/udp.h
+++ b/aos/vision/events/udp.h
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
-#include "aos/common/macros.h"
-#include "aos/common/scoped_fd.h"
+#include "aos/macros.h"
+#include "aos/scoped/scoped_fd.h"
namespace aos {
namespace events {
diff --git a/aos/vision/image/BUILD b/aos/vision/image/BUILD
index 8409ea5..39c40d6 100644
--- a/aos/vision/image/BUILD
+++ b/aos/vision/image/BUILD
@@ -9,7 +9,7 @@
"//tools:armhf-debian",
],
deps = [
- "//aos/common/logging",
+ "//aos/logging",
],
)
@@ -34,8 +34,8 @@
deps = [
":camera_params",
":image_types",
- "//aos/common:time",
- "//aos/common/logging",
+ "//aos/time:time",
+ "//aos/logging",
],
)
@@ -48,7 +48,7 @@
],
deps = [
":image_types",
- "//aos/common/logging",
+ "//aos/logging",
"//third_party/libjpeg",
],
)
diff --git a/aos/vision/image/image_types.h b/aos/vision/image/image_types.h
index f8e5e65..d4ddbf2 100644
--- a/aos/vision/image/image_types.h
+++ b/aos/vision/image/image_types.h
@@ -7,7 +7,7 @@
#include <sstream>
#include <experimental/string_view>
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
namespace aos {
namespace vision {
diff --git a/aos/vision/image/jpeg_routines.cc b/aos/vision/image/jpeg_routines.cc
index b6be41b..237daff 100644
--- a/aos/vision/image/jpeg_routines.cc
+++ b/aos/vision/image/jpeg_routines.cc
@@ -10,7 +10,7 @@
#include <unistd.h>
#include <cstring>
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
#include "third_party/libjpeg/jpeglib.h"
namespace aos {
diff --git a/aos/vision/image/reader.cc b/aos/vision/image/reader.cc
index 57766e2..aaf9a10 100644
--- a/aos/vision/image/reader.cc
+++ b/aos/vision/image/reader.cc
@@ -12,8 +12,8 @@
#include <sys/types.h>
#include <unistd.h>
-#include "aos/common/logging/logging.h"
-#include "aos/common/time.h"
+#include "aos/logging/logging.h"
+#include "aos/time/time.h"
#define CLEAR(x) memset(&(x), 0, sizeof(x))
diff --git a/aos/vision/image/reader.h b/aos/vision/image/reader.h
index e913ad1..adb3a3c 100644
--- a/aos/vision/image/reader.h
+++ b/aos/vision/image/reader.h
@@ -5,7 +5,7 @@
#include <functional>
#include <string>
-#include "aos/common/time.h"
+#include "aos/time/time.h"
#include "aos/vision/image/V4L2.h"
#include "aos/vision/image/camera_params.pb.h"
#include "aos/vision/image/image_types.h"
diff --git a/aos/vision/tools/BUILD b/aos/vision/tools/BUILD
index 09c2d55..c4119e8 100644
--- a/aos/vision/tools/BUILD
+++ b/aos/vision/tools/BUILD
@@ -3,8 +3,8 @@
gtk_dependent_cc_binary(name = "jpeg_vision_test",
srcs = ["jpeg_vision_test.cc"],
deps = [
- "//aos/common/logging:logging",
- "//aos/common/logging:implementations",
+ "//aos/logging:logging",
+ "//aos/logging:implementations",
"//aos/vision/math:vector",
"//aos/vision/image:reader",
"//aos/vision/image:jpeg_routines",
@@ -22,8 +22,8 @@
name = 'camera_primer',
srcs = ['camera_primer.cc'],
deps = [
- '//aos/common/logging:logging',
- '//aos/common/logging:implementations',
+ '//aos/logging:logging',
+ '//aos/logging:implementations',
'//aos/vision/image:image_stream',
'//aos/vision/events:epoll_events',
],
diff --git a/aos/vision/tools/camera_primer.cc b/aos/vision/tools/camera_primer.cc
index 3ba24bc..1ac96fd 100644
--- a/aos/vision/tools/camera_primer.cc
+++ b/aos/vision/tools/camera_primer.cc
@@ -1,5 +1,5 @@
-#include "aos/common/logging/implementations.h"
-#include "aos/common/logging/logging.h"
+#include "aos/logging/implementations.h"
+#include "aos/logging/logging.h"
#include "aos/vision/events/epoll_events.h"
#include "aos/vision/image/image_stream.h"
diff --git a/aos/vision/tools/jpeg_vision_test.cc b/aos/vision/tools/jpeg_vision_test.cc
index 059166e..072b57b 100644
--- a/aos/vision/tools/jpeg_vision_test.cc
+++ b/aos/vision/tools/jpeg_vision_test.cc
@@ -12,8 +12,8 @@
#include <memory>
#include <vector>
-#include "aos/common/logging/implementations.h"
-#include "aos/common/logging/logging.h"
+#include "aos/logging/implementations.h"
+#include "aos/logging/logging.h"
#include "aos/vision/blob/range_image.h"
#include "aos/vision/blob/stream_view.h"
#include "aos/vision/blob/threshold.h"