More work cleaning up the BUILD files
Change-Id: I47fb18e7a12cd7e081631a5369274ef1e25f22c4
diff --git a/y2015/BUILD b/y2015/BUILD
index 22a0300..6737bd9 100644
--- a/y2015/BUILD
+++ b/y2015/BUILD
@@ -14,6 +14,7 @@
'//aos/common/network:team_number',
'//frc971/control_loops:state_feedback_loop',
'//y2015/control_loops/drivetrain:polydrivetrain_plants',
+ '//y2015/autonomous:auto_queue',
],
)
@@ -34,7 +35,6 @@
'//y2015/control_loops/drivetrain:drivetrain_queue',
'//y2015/control_loops/fridge:fridge_queue',
'//y2015:constants',
- '//y2015/autonomous:auto_queue',
'//frc971/autonomous:auto_queue',
'//y2015/actors:stack_action_lib',
'//y2015/actors:stack_and_lift_action_lib',
diff --git a/y2015/actors/BUILD b/y2015/actors/BUILD
index 8500bf0..3aee02f 100644
--- a/y2015/actors/BUILD
+++ b/y2015/actors/BUILD
@@ -128,7 +128,7 @@
'score_actor_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common:queue_testutils',
'//aos/common/logging:queue_logging',
'//aos/common:queues',
@@ -405,15 +405,8 @@
],
)
-filegroup(
- name = 'stack_action_queue',
- srcs = [
- ':stack_action_queue_real',
- ],
-)
-
queue_library(
- name = 'stack_action_queue_real',
+ name = 'stack_action_queue',
srcs = [
'stack_action.q',
],
@@ -436,7 +429,7 @@
'stack_actor_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common:queue_testutils',
'//aos/common/logging:queue_logging',
'//aos/common:queues',
@@ -482,15 +475,8 @@
],
)
-filegroup(
- name = 'lift_action_queue',
- srcs = [
- ':lift_action_queue_real',
- ],
-)
-
queue_library(
- name = 'lift_action_queue_real',
+ name = 'lift_action_queue',
srcs = [
'lift_action.q',
],
diff --git a/y2015/control_loops/claw/BUILD b/y2015/control_loops/claw/BUILD
index 134ef55..e671004 100644
--- a/y2015/control_loops/claw/BUILD
+++ b/y2015/control_loops/claw/BUILD
@@ -52,7 +52,7 @@
'claw_lib_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':claw_lib',
'//frc971/control_loops:state_feedback_loop',
'//aos/common/controls:control_loop_test',
diff --git a/y2015/control_loops/drivetrain/BUILD b/y2015/control_loops/drivetrain/BUILD
index c08e4b0..bdf7ba0 100644
--- a/y2015/control_loops/drivetrain/BUILD
+++ b/y2015/control_loops/drivetrain/BUILD
@@ -69,7 +69,7 @@
'drivetrain_lib_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':drivetrain_queue',
':drivetrain_lib',
'//aos/common/controls:control_loop_test',
diff --git a/y2015/control_loops/fridge/BUILD b/y2015/control_loops/fridge/BUILD
index 1304a82..458d67b 100644
--- a/y2015/control_loops/fridge/BUILD
+++ b/y2015/control_loops/fridge/BUILD
@@ -22,7 +22,7 @@
deps = [
'//aos/common/controls:control_loop_queues',
'//frc971/control_loops:queues',
- '//frc971/zeroing:zeroing',
+ '//frc971/zeroing:zeroing_queue',
],
)
@@ -45,6 +45,7 @@
'//y2015:constants',
'//frc971/control_loops:state_feedback_loop',
'//frc971/control_loops/voltage_cap:voltage_cap',
+ '//frc971/zeroing',
],
)
@@ -53,18 +54,17 @@
srcs = [
'fridge_lib_test.cc',
'arm_motor_plant.cc',
- ],
- hdrs = [
'arm_motor_plant.h',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':fridge_lib',
'//frc971/control_loops:state_feedback_loop',
'//aos/common/controls:control_loop_test',
'//aos/common:time',
'//frc971/control_loops:position_sensor_sim',
'//frc971/control_loops:team_number_test_environment',
+ '//y2015/util:kinematics',
],
)
diff --git a/y2015/http_status/BUILD b/y2015/http_status/BUILD
index d71574c..1bb5c8f 100644
--- a/y2015/http_status/BUILD
+++ b/y2015/http_status/BUILD
@@ -4,8 +4,6 @@
name = 'http_status',
srcs = [
'http_status.cc',
- ],
- hdrs = [
'http_status.h',
],
deps = [
diff --git a/y2015/util/BUILD b/y2015/util/BUILD
index 2a7250f..bf1d3ed 100644
--- a/y2015/util/BUILD
+++ b/y2015/util/BUILD
@@ -14,7 +14,7 @@
'kinematics_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common:queue_testutils',
'//aos/common/logging',
'//frc971/control_loops:team_number_test_environment',
diff --git a/y2015/wpilib/BUILD b/y2015/wpilib/BUILD
index 61d5c62..a9c21e3 100644
--- a/y2015/wpilib/BUILD
+++ b/y2015/wpilib/BUILD
@@ -9,12 +9,13 @@
'//aos/linux_code:init',
'//aos/common:stl_mutex',
'//aos/common/logging',
- '//third_party/WPILib',
+ '//aos/externals:wpilib',
'//y2015:constants',
'//y2015/control_loops/drivetrain:drivetrain_queue',
'//y2015/control_loops/fridge:fridge_queue',
'//y2015/control_loops/claw:claw_queue',
'//y2015/autonomous:auto_queue',
+ '//frc971/autonomous:auto_queue',
'//aos/common/controls:control_loop',
'//aos/common/util:log_interval',
'//aos/common:time',