cleaned up a bunch of build + formatting
diff --git a/aos/common/messages/QueueHolder.h b/aos/common/messages/QueueHolder.h
index 2b7c0d7..23ddc95 100644
--- a/aos/common/messages/QueueHolder.h
+++ b/aos/common/messages/QueueHolder.h
@@ -6,11 +6,14 @@
#include <algorithm>
-#include "aos/aos_core.h"
#include "aos/common/control_loop/Timing.h"
#include "aos/common/byteorder.h"
#include "aos/common/time.h"
#include "aos/common/type_traits.h"
+#include "aos/common/logging/logging.h"
+#ifndef __VXWORKS__
+#include "aos/atom_code/ipc_lib/queue.h"
+#endif
namespace aos {
diff --git a/aos/common/messages/messages.gyp b/aos/common/messages/messages.gyp
index 94508c4..e7669c7 100644
--- a/aos/common/messages/messages.gyp
+++ b/aos/common/messages/messages.gyp
@@ -1,6 +1,33 @@
{
'targets': [
{
+ 'target_name': 'QueueHolder',
+ 'type': 'static_library',
+ 'sources': [
+ # 'QueueHolder.h'
+ ],
+ 'dependencies': [
+ '<(AOS)/common/common.gyp:timing',
+ '<(AOS)/common/common.gyp:time',
+ '<(AOS)/build/aos.gyp:logging',
+ ],
+ 'export_dependent_settings': [
+ '<(AOS)/common/common.gyp:timing',
+ '<(AOS)/common/common.gyp:time',
+ '<(AOS)/build/aos.gyp:logging',
+ ],
+ 'conditions': [
+ ['OS!="crio"', {
+ 'dependencies': [
+ '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:ipc_lib',
+ ],
+ 'export_dependent_settings': [
+ '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:ipc_lib',
+ ],
+ }],
+ ],
+ },
+ {
'target_name': 'aos_queues',
'type': 'static_library',
'sources': [