Removed Common
Change-Id: I01ea8f07220375c2ad9bc0092281d4f27c642303
diff --git a/aos/linux_code/BUILD b/aos/linux_code/BUILD
index b572a25..7cc22d0 100644
--- a/aos/linux_code/BUILD
+++ b/aos/linux_code/BUILD
@@ -6,9 +6,9 @@
"dump_rtprio.cc",
],
deps = [
- "//aos/common:time",
- "//aos/common/logging",
- "//aos/common/logging:implementations",
+ "//aos/time:time",
+ "//aos/logging",
+ "//aos/logging:implementations",
],
)
@@ -20,7 +20,7 @@
compatible_with = [
"//tools:armhf-debian",
],
- visibility = ["//aos/common:__pkg__"],
+ visibility = ["//aos:__pkg__"],
)
cc_library(
@@ -39,7 +39,7 @@
],
deps = [
"//aos:once",
- "//aos/common:die",
+ "//aos:die",
],
)
@@ -50,8 +50,8 @@
],
deps = [
":complex_thread_local",
- "//aos/common/logging",
- "//aos/common/util:thread",
+ "//aos/logging",
+ "//aos/util:thread",
"//aos/testing:googletest",
],
)
@@ -68,8 +68,8 @@
"//tools:armhf-debian",
],
deps = [
- "//aos/common:die",
- "//aos/common/logging:implementations",
+ "//aos:die",
+ "//aos/logging:implementations",
"//aos/linux_code/ipc_lib:shared_mem",
],
)
@@ -87,8 +87,8 @@
],
deps = [
"//aos:once",
- "//aos/common:unique_malloc_ptr",
- "//aos/common/logging",
+ "//aos:unique_malloc_ptr",
+ "//aos/logging",
],
)
@@ -99,6 +99,6 @@
],
deps = [
":init",
- "//aos/common/util:run_command",
+ "//aos/util:run_command",
],
)
diff --git a/aos/linux_code/complex_thread_local.cc b/aos/linux_code/complex_thread_local.cc
index f5ddc9c..fbfe914 100644
--- a/aos/linux_code/complex_thread_local.cc
+++ b/aos/linux_code/complex_thread_local.cc
@@ -2,7 +2,7 @@
#include <pthread.h>
-#include "aos/common/die.h"
+#include "aos/die.h"
#include "aos/once.h"
#define SIMPLE_CHECK(call) \
diff --git a/aos/linux_code/complex_thread_local_test.cc b/aos/linux_code/complex_thread_local_test.cc
index 97f0568..6163ba7 100644
--- a/aos/linux_code/complex_thread_local_test.cc
+++ b/aos/linux_code/complex_thread_local_test.cc
@@ -4,7 +4,7 @@
#include "gtest/gtest.h"
-#include "aos/common/util/thread.h"
+#include "aos/util/thread.h"
namespace aos {
namespace testing {
diff --git a/aos/linux_code/configuration.cc b/aos/linux_code/configuration.cc
index 0536e25..76e744f 100644
--- a/aos/linux_code/configuration.cc
+++ b/aos/linux_code/configuration.cc
@@ -8,8 +8,8 @@
#include <ifaddrs.h>
#include <unistd.h>
-#include "aos/common/logging/logging.h"
-#include "aos/common/unique_malloc_ptr.h"
+#include "aos/logging/logging.h"
+#include "aos/unique_malloc_ptr.h"
#include "aos/once.h"
namespace aos {
diff --git a/aos/linux_code/core.cc b/aos/linux_code/core.cc
index 189df1d..3aab562 100644
--- a/aos/linux_code/core.cc
+++ b/aos/linux_code/core.cc
@@ -8,7 +8,7 @@
#include <string>
#include "aos/linux_code/init.h"
-#include "aos/common/util/run_command.h"
+#include "aos/util/run_command.h"
// Initializes shared memory. This is the only file that will create the shared
// memory file if it doesn't already exist (and set everything up).
diff --git a/aos/linux_code/dump_rtprio.cc b/aos/linux_code/dump_rtprio.cc
index 2bfb9c1..2b821cf 100644
--- a/aos/linux_code/dump_rtprio.cc
+++ b/aos/linux_code/dump_rtprio.cc
@@ -16,9 +16,9 @@
#include <string>
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/implementations.h"
-#include "aos/common/time.h"
+#include "aos/logging/logging.h"
+#include "aos/logging/implementations.h"
+#include "aos/time/time.h"
namespace {
diff --git a/aos/linux_code/init.cc b/aos/linux_code/init.cc
index ce557e4..c5a2285 100644
--- a/aos/linux_code/init.cc
+++ b/aos/linux_code/init.cc
@@ -13,8 +13,8 @@
#include <sys/prctl.h>
#include <malloc.h>
-#include "aos/common/die.h"
-#include "aos/common/logging/implementations.h"
+#include "aos/die.h"
+#include "aos/logging/implementations.h"
#include "aos/linux_code/ipc_lib/shared_mem.h"
namespace FLAG__namespace_do_not_use_directly_use_DECLARE_double_instead {
@@ -27,7 +27,7 @@
namespace logging {
namespace internal {
-// Implemented in aos/common/logging/context.cc.
+// Implemented in aos/logging/context.cc.
void ReloadThreadName();
} // namespace internal
diff --git a/aos/linux_code/ipc_lib/BUILD b/aos/linux_code/ipc_lib/BUILD
index 289bde8..d550a65 100644
--- a/aos/linux_code/ipc_lib/BUILD
+++ b/aos/linux_code/ipc_lib/BUILD
@@ -16,9 +16,9 @@
],
deps = [
"//aos:once",
- "//aos/common:macros",
- "//aos/common/logging",
- "//aos/common/util:compiler_memory_barrier",
+ "//aos:macros",
+ "//aos/logging",
+ "//aos/util:compiler_memory_barrier",
],
)
@@ -57,7 +57,7 @@
":aos_sync",
":core_lib",
":shared_mem_types",
- "//aos/common/logging",
+ "//aos/logging",
],
)
@@ -93,10 +93,10 @@
deps = [
":core_lib",
":shared_mem",
- "//aos/common:condition",
- "//aos/common:mutex",
- "//aos/common/logging",
- "//aos/common/util:options",
+ "//aos:condition",
+ "//aos/mutex:mutex",
+ "//aos/logging",
+ "//aos/util:options",
],
)
@@ -108,11 +108,11 @@
deps = [
":core_lib",
":queue",
- "//aos/common:die",
- "//aos/common:time",
- "//aos/common/logging",
- "//aos/common/util:death_test_log_implementation",
- "//aos/common/util:thread",
+ "//aos:die",
+ "//aos/time:time",
+ "//aos/logging",
+ "//aos/util:death_test_log_implementation",
+ "//aos/util:thread",
"//aos/testing:googletest",
"//aos/testing:prevent_exit",
"//aos/testing:test_shm",
@@ -132,12 +132,12 @@
],
deps = [
":core_lib",
- "//aos/common:die",
- "//aos/common:mutex",
- "//aos/common:time",
- "//aos/common/libc:aos_strsignal",
- "//aos/common/libc:dirname",
- "//aos/common/logging",
+ "//aos:die",
+ "//aos/mutex:mutex",
+ "//aos/time:time",
+ "//aos/libc:aos_strsignal",
+ "//aos/libc:dirname",
+ "//aos/logging",
"//aos/testing:googletest",
"//aos/testing:test_shm",
],
@@ -157,11 +157,11 @@
],
deps = [
":queue",
- "//aos/common:condition",
- "//aos/common:event",
- "//aos/common:mutex",
- "//aos/common/logging",
- "//aos/common/logging:implementations",
+ "//aos:condition",
+ "//aos:event",
+ "//aos/mutex:mutex",
+ "//aos/logging",
+ "//aos/logging:implementations",
"//aos/linux_code:init",
"//third_party/gflags",
],
diff --git a/aos/linux_code/ipc_lib/aos_sync.cc b/aos/linux_code/ipc_lib/aos_sync.cc
index d0baaa0..af7a669 100644
--- a/aos/linux_code/ipc_lib/aos_sync.cc
+++ b/aos/linux_code/ipc_lib/aos_sync.cc
@@ -26,9 +26,9 @@
#include <algorithm>
#include <type_traits>
-#include "aos/common/logging/logging.h"
-#include "aos/common/macros.h"
-#include "aos/common/util/compiler_memory_barrier.h"
+#include "aos/logging/logging.h"
+#include "aos/macros.h"
+#include "aos/util/compiler_memory_barrier.h"
#include "aos/once.h"
using ::aos::linux_code::ipc_lib::FutexAccessorObserver;
diff --git a/aos/linux_code/ipc_lib/ipc_comparison.cc b/aos/linux_code/ipc_lib/ipc_comparison.cc
index 11373a5..6e67e13 100644
--- a/aos/linux_code/ipc_lib/ipc_comparison.cc
+++ b/aos/linux_code/ipc_lib/ipc_comparison.cc
@@ -21,12 +21,12 @@
#include <string>
#include <thread>
-#include "aos/common/condition.h"
-#include "aos/common/event.h"
-#include "aos/common/logging/implementations.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/mutex.h"
-#include "aos/common/time.h"
+#include "aos/condition.h"
+#include "aos/event.h"
+#include "aos/logging/implementations.h"
+#include "aos/logging/logging.h"
+#include "aos/mutex/mutex.h"
+#include "aos/time/time.h"
#include "aos/linux_code/init.h"
#include "aos/linux_code/ipc_lib/queue.h"
diff --git a/aos/linux_code/ipc_lib/ipc_stress_test.cc b/aos/linux_code/ipc_lib/ipc_stress_test.cc
index 1b4d22e..e43e6a5 100644
--- a/aos/linux_code/ipc_lib/ipc_stress_test.cc
+++ b/aos/linux_code/ipc_lib/ipc_stress_test.cc
@@ -9,13 +9,13 @@
#include <chrono>
#include <string>
-#include "aos/common/die.h"
-#include "aos/common/libc/aos_strsignal.h"
-#include "aos/common/libc/dirname.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/mutex.h"
-#include "aos/common/time.h"
-#include "aos/common/type_traits.h"
+#include "aos/die.h"
+#include "aos/libc/aos_strsignal.h"
+#include "aos/libc/dirname.h"
+#include "aos/logging/logging.h"
+#include "aos/mutex/mutex.h"
+#include "aos/time/time.h"
+#include "aos/type_traits/type_traits.h"
#include "aos/linux_code/ipc_lib/core_lib.h"
#include "aos/testing/test_shm.h"
diff --git a/aos/linux_code/ipc_lib/queue.cc b/aos/linux_code/ipc_lib/queue.cc
index b874b08..a89554d 100644
--- a/aos/linux_code/ipc_lib/queue.cc
+++ b/aos/linux_code/ipc_lib/queue.cc
@@ -13,7 +13,7 @@
#include <memory>
#include <algorithm>
-#include "aos/common/type_traits.h"
+#include "aos/type_traits/type_traits.h"
#include "aos/linux_code/ipc_lib/core_lib.h"
namespace aos {
diff --git a/aos/linux_code/ipc_lib/queue.h b/aos/linux_code/ipc_lib/queue.h
index 0e6c3ae..1a0d174 100644
--- a/aos/linux_code/ipc_lib/queue.h
+++ b/aos/linux_code/ipc_lib/queue.h
@@ -2,10 +2,10 @@
#define AOS_LINUX_CODE_IPC_LIB_QUEUE_H_
#include "aos/linux_code/ipc_lib/shared_mem.h"
-#include "aos/common/mutex.h"
-#include "aos/common/condition.h"
-#include "aos/common/util/options.h"
-#include "aos/common/logging/logging.h"
+#include "aos/mutex/mutex.h"
+#include "aos/condition.h"
+#include "aos/util/options.h"
+#include "aos/logging/logging.h"
// TODO(brians) add valgrind client requests to the queue and shared_mem_malloc
// code to make checking for leaks work better
diff --git a/aos/linux_code/ipc_lib/raw_queue_test.cc b/aos/linux_code/ipc_lib/raw_queue_test.cc
index 0c341e3..08b7445 100644
--- a/aos/linux_code/ipc_lib/raw_queue_test.cc
+++ b/aos/linux_code/ipc_lib/raw_queue_test.cc
@@ -12,14 +12,14 @@
#include "gtest/gtest.h"
#include "aos/linux_code/ipc_lib/core_lib.h"
-#include "aos/common/type_traits.h"
+#include "aos/type_traits/type_traits.h"
#include "aos/testing/test_shm.h"
-#include "aos/common/time.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/die.h"
-#include "aos/common/util/thread.h"
-#include "aos/common/util/options.h"
-#include "aos/common/util/death_test_log_implementation.h"
+#include "aos/time/time.h"
+#include "aos/logging/logging.h"
+#include "aos/die.h"
+#include "aos/util/thread.h"
+#include "aos/util/options.h"
+#include "aos/util/death_test_log_implementation.h"
#include "aos/testing/prevent_exit.h"
using ::testing::AssertionResult;
diff --git a/aos/linux_code/ipc_lib/shared_mem.c b/aos/linux_code/ipc_lib/shared_mem.c
index f0a2aee..e0f1bfb 100644
--- a/aos/linux_code/ipc_lib/shared_mem.c
+++ b/aos/linux_code/ipc_lib/shared_mem.c
@@ -11,7 +11,7 @@
#include <assert.h>
#include "aos/linux_code/ipc_lib/core_lib.h"
-#include "aos/common/logging/logging.h"
+#include "aos/logging/logging.h"
#include "aos/linux_code/ipc_lib/aos_sync.h"
// the path for the shared memory segment. see shm_open(3) for restrictions
diff --git a/aos/linux_code/starter/BUILD b/aos/linux_code/starter/BUILD
index 74af77d..68b39bd 100644
--- a/aos/linux_code/starter/BUILD
+++ b/aos/linux_code/starter/BUILD
@@ -16,12 +16,12 @@
deps = [
'//aos/linux_code:init',
'//third_party/libevent',
- '//aos/common/logging',
- '//aos/common/logging:implementations',
+ '//aos/logging',
+ '//aos/logging:implementations',
'//aos:once',
- '//aos/common:time',
- '//aos/common/libc:aos_strsignal',
- '//aos/common/util:run_command',
- '//aos/common:unique_malloc_ptr',
+ '//aos/time:time',
+ '//aos/libc:aos_strsignal',
+ '//aos/util:run_command',
+ '//aos:unique_malloc_ptr',
],
)
diff --git a/aos/linux_code/starter/starter.cc b/aos/linux_code/starter/starter.cc
index 62e540b..0c7fdea 100644
--- a/aos/linux_code/starter/starter.cc
+++ b/aos/linux_code/starter/starter.cc
@@ -29,12 +29,12 @@
#include "third_party/libevent/event.h"
-#include "aos/common/libc/aos_strsignal.h"
-#include "aos/common/logging/implementations.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/time.h"
-#include "aos/common/unique_malloc_ptr.h"
-#include "aos/common/util/run_command.h"
+#include "aos/libc/aos_strsignal.h"
+#include "aos/logging/implementations.h"
+#include "aos/logging/logging.h"
+#include "aos/time/time.h"
+#include "aos/unique_malloc_ptr.h"
+#include "aos/util/run_command.h"
#include "aos/linux_code/init.h"
#include "aos/once.h"