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>
diff --git a/frc971/autonomous/autonomous.gyp b/frc971/autonomous/autonomous.gyp
index c2e9d96..118c199 100644
--- a/frc971/autonomous/autonomous.gyp
+++ b/frc971/autonomous/autonomous.gyp
@@ -7,12 +7,6 @@
'variables': {
'header_path': 'frc971/autonomous',
},
- 'dependencies': [
- '<(AOS)/common/common.gyp:queues',
- ],
- 'export_dependent_settings': [
- '<(AOS)/common/common.gyp:queues',
- ],
'includes': ['../../aos/build/queues.gypi'],
},
{
diff --git a/frc971/control_loops/claw/claw.gyp b/frc971/control_loops/claw/claw.gyp
index b522a95..2575adf 100644
--- a/frc971/control_loops/claw/claw.gyp
+++ b/frc971/control_loops/claw/claw.gyp
@@ -54,6 +54,7 @@
'claw_lib',
'<(AOS)/common/common.gyp:queue_testutils',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
+ '<(AOS)/common/common.gyp:queues',
],
},
{
diff --git a/frc971/control_loops/drivetrain/drivetrain.cc b/frc971/control_loops/drivetrain/drivetrain.cc
index c92b45e..7f50da8 100644
--- a/frc971/control_loops/drivetrain/drivetrain.cc
+++ b/frc971/control_loops/drivetrain/drivetrain.cc
@@ -7,7 +7,6 @@
#include "Eigen/Dense"
#include "aos/common/logging/logging.h"
-#include "aos/common/queue.h"
#include "aos/common/controls/polytope.h"
#include "aos/common/commonmath.h"
#include "aos/common/logging/queue_logging.h"
diff --git a/frc971/control_loops/drivetrain/drivetrain.gyp b/frc971/control_loops/drivetrain/drivetrain.gyp
index 9eb54d2..bc52ab4 100644
--- a/frc971/control_loops/drivetrain/drivetrain.gyp
+++ b/frc971/control_loops/drivetrain/drivetrain.gyp
@@ -9,11 +9,9 @@
},
'dependencies': [
'<(AOS)/common/controls/controls.gyp:control_loop_queues',
- '<(AOS)/common/common.gyp:queues',
],
'export_dependent_settings': [
'<(AOS)/common/controls/controls.gyp:control_loop_queues',
- '<(AOS)/common/common.gyp:queues',
],
'includes': ['../../../aos/build/queues.gypi'],
},
@@ -71,6 +69,7 @@
'<(AOS)/common/common.gyp:queue_testutils',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
'<(DEPTH)/frc971/queues/queues.gyp:queues',
+ '<(AOS)/common/common.gyp:queues',
],
},
{
diff --git a/frc971/control_loops/shooter/shooter.gyp b/frc971/control_loops/shooter/shooter.gyp
index 30226fd..7a9015a 100755
--- a/frc971/control_loops/shooter/shooter.gyp
+++ b/frc971/control_loops/shooter/shooter.gyp
@@ -50,6 +50,7 @@
'shooter_lib',
'<(AOS)/common/common.gyp:queue_testutils',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:state_feedback_loop',
+ '<(AOS)/common/common.gyp:queues',
],
},
{
diff --git a/frc971/queues/queues.gyp b/frc971/queues/queues.gyp
index 8af1f10..60fbabf 100644
--- a/frc971/queues/queues.gyp
+++ b/frc971/queues/queues.gyp
@@ -13,12 +13,6 @@
'variables': {
'header_path': 'frc971/queues',
},
- 'dependencies': [
- '<(AOS)/common/common.gyp:queues',
- ],
- 'export_dependent_settings': [
- '<(AOS)/common/common.gyp:queues',
- ],
'includes': ['../../aos/build/queues.gypi'],
},
],