fixed some dependency confusion
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index 132c61f..fab82a2 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -9,9 +9,6 @@
'variables': {
'header_path': 'aos/common',
},
- 'dependencies': [
- '<(AOS)/common/common.gyp:queues',
- ],
'includes': ['../build/queues.gypi'],
},
{
diff --git a/aos/common/controls/controls.gyp b/aos/common/controls/controls.gyp
index 36daf56..0945831 100644
--- a/aos/common/controls/controls.gyp
+++ b/aos/common/controls/controls.gyp
@@ -44,9 +44,6 @@
'variables': {
'header_path': 'aos/common/controls',
},
- 'dependencies': [
- '<(AOS)/common/common.gyp:queues',
- ],
'includes': ['../../../aos/build/queues.gypi'],
},
{
@@ -65,6 +62,7 @@
'<(AOS)/common/util/util.gyp:log_interval',
'sensor_generation',
'output_check',
+ '<(AOS)/common/common.gyp:queues',
],
'export_dependent_settings': [
'<(AOS)/common/messages/messages.gyp:robot_state',
@@ -76,6 +74,7 @@
'<(AOS)/common/util/util.gyp:log_interval',
'sensor_generation',
'output_check',
+ '<(AOS)/common/common.gyp:queues',
],
},
],
diff --git a/aos/common/messages/messages.gyp b/aos/common/messages/messages.gyp
index 0b7805b..ab336b9 100644
--- a/aos/common/messages/messages.gyp
+++ b/aos/common/messages/messages.gyp
@@ -9,12 +9,6 @@
'variables': {
'header_path': 'aos/common/messages',
},
- 'dependencies': [
- '<(AOS)/common/common.gyp:queues',
- ],
- 'export_dependent_settings': [
- '<(AOS)/common/common.gyp:queues',
- ],
'includes': ['../../build/queues.gypi'],
},
],
diff --git a/aos/linux_code/ipc_lib/raw_queue_test.cc b/aos/linux_code/ipc_lib/raw_queue_test.cc
index 2943291..c2506a4 100644
--- a/aos/linux_code/ipc_lib/raw_queue_test.cc
+++ b/aos/linux_code/ipc_lib/raw_queue_test.cc
@@ -1,4 +1,4 @@
-#include "aos/common/queue.h"
+#include "aos/linux_code/ipc_lib/queue.h"
#include <unistd.h>
#include <sys/mman.h>