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/build/queues.bzl

diff --git a/aos/build/queues.bzl b/aos/build/queues.bzl
index 840b4fe..26c2cf8 100644
--- a/aos/build/queues.bzl
+++ b/aos/build/queues.bzl
@@ -107,9 +107,9 @@
     hdrs = [src + '.h' for src in srcs],
     deps = deps + [
       '//aos:once',
-      '//aos/common:queues',
-      '//aos/common:queue_types',
-      '//aos/common/logging:printf_formats',
+      '//aos:queues',
+      '//aos:queue_types',
+      '//aos/logging:printf_formats',
     ],
     visibility = visibility,
     compatible_with = compatible_with,

aos/build/queues/compiler.rb

diff --git a/aos/build/queues/compiler.rb b/aos/build/queues/compiler.rb
index f47763d..6ca141d 100644
--- a/aos/build/queues/compiler.rb
+++ b/aos/build/queues/compiler.rb
@@ -105,11 +105,11 @@
   cpp_tree = output_file.make_cpp_tree($src_filename)
 
   cpp_tree.add_cc_include(($src_filename + ".h").inspect)
-  cpp_tree.add_cc_include("aos/common/byteorder.h".inspect)
+  cpp_tree.add_cc_include("aos/byteorder.h".inspect)
   cpp_tree.add_cc_include("<inttypes.h>")
-  cpp_tree.add_cc_include("aos/common/queue_types.h".inspect)
+  cpp_tree.add_cc_include("aos/queue_types.h".inspect)
   cpp_tree.add_cc_include("aos/once.h".inspect)
-  cpp_tree.add_cc_include("aos/common/logging/printf_formats.h".inspect)
+  cpp_tree.add_cc_include("aos/logging/printf_formats.h".inspect)
   cpp_tree.add_cc_using("::aos::to_network")
   cpp_tree.add_cc_using("::aos::to_host")
 

aos/build/queues/output/q_file.rb

diff --git a/aos/build/queues/output/q_file.rb b/aos/build/queues/output/q_file.rb
index a2f438d..1e39247 100644
--- a/aos/build/queues/output/q_file.rb
+++ b/aos/build/queues/output/q_file.rb
@@ -37,8 +37,8 @@
 	def make_cpp_tree(rel_path)
 		cpp_tree = DepFilePair.new(rel_path)
 		cpp_tree.add_header_include("<array>")
-		cpp_tree.add_header_include("\"aos/common/macros.h\"")
-		cpp_tree.add_header_include("\"aos/common/queue.h\"")
+		cpp_tree.add_header_include("\"aos/macros.h\"")
+		cpp_tree.add_header_include("\"aos/queue.h\"")
 		@class_types.each do |type|
 			cpp_tree.get(type)
 		end

aos/build/queues/print_field.rb

diff --git a/aos/build/queues/print_field.rb b/aos/build/queues/print_field.rb
index 65837ee..4f26d04 100644
--- a/aos/build/queues/print_field.rb
+++ b/aos/build/queues/print_field.rb
@@ -15,10 +15,10 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#include "aos/common/byteorder.h"
-#include "aos/common/time.h"
-#include "aos/common/print_field_helpers.h"
-#include "aos/common/logging/printf_formats.h"
+#include "aos/byteorder.h"
+#include "aos/time/time.h"
+#include "aos/print_field_helpers.h"
+#include "aos/logging/printf_formats.h"
 
 namespace aos {
 

aos/build/queues/queue_primitives.rb

diff --git a/aos/build/queues/queue_primitives.rb b/aos/build/queues/queue_primitives.rb
index 45687ea..a5f6624 100644
--- a/aos/build/queues/queue_primitives.rb
+++ b/aos/build/queues/queue_primitives.rb
@@ -14,7 +14,7 @@
 
 #include <stdint.h>
 
-#include "aos/common/time.h"
+#include "aos/time/time.h"
 
 namespace aos {
 namespace queue_primitive_types {