Remove stupid wpilib forwarding target
It's silly to need to use NO_BUILD_AMD64 for //aos/...
Change-Id: I103b3c3a0f5cfb72c081c5aafef624cf0533acb0
diff --git a/y2012/wpilib/BUILD b/y2012/wpilib/BUILD
index 5c0c900..9b42c3a 100644
--- a/y2012/wpilib/BUILD
+++ b/y2012/wpilib/BUILD
@@ -9,7 +9,7 @@
'//aos/linux_code:init',
'//aos/common:stl_mutex',
'//aos/common/logging',
- '//aos/externals:wpilib',
+ '//third_party/allwpilib_2016:wpilib',
'//y2012/control_loops/drivetrain:drivetrain_queue',
'//y2012/control_loops/accessories:accessories_queue',
'//aos/common/controls:control_loop',
@@ -30,5 +30,6 @@
'//frc971/control_loops:queues',
'//frc971/wpilib:logging_queue',
'//frc971/wpilib:wpilib_interface',
+ '//frc971/wpilib:dma',
],
)
diff --git a/y2012/wpilib/wpilib_interface.cc b/y2012/wpilib/wpilib_interface.cc
index a9b7bf6..6702dc4 100644
--- a/y2012/wpilib/wpilib_interface.cc
+++ b/y2012/wpilib/wpilib_interface.cc
@@ -14,7 +14,6 @@
#include "Compressor.h"
#include "Relay.h"
#include "frc971/wpilib/wpilib_robot_base.h"
-#include "dma.h"
#ifndef WPILIB2015
#include "DigitalGlitchFilter.h"
#endif
@@ -44,6 +43,7 @@
#include "frc971/wpilib/encoder_and_potentiometer.h"
#include "frc971/wpilib/logging.q.h"
#include "frc971/wpilib/wpilib_interface.h"
+#include "frc971/wpilib/dma.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846