commit b5b46ca609a6a87660a3d7ad197f99ba80bf8292
author Brian Silverman <brians> Sun Mar 13 01:14:17 2016 -0500
committer Brian Silverman <brians> Sun Mar 13 01:14:17 2016 -0500
tree 6310597fe1134490ef423acf25bccc4866533836
parent 41e3b7967b39e9db84a222f70e284cccdae3241a

Remove stupid wpilib forwarding target

It's silly to need to use NO_BUILD_AMD64 for //aos/...

Change-Id: I103b3c3a0f5cfb72c081c5aafef624cf0533acb0

y2014/wpilib/BUILD

diff --git a/y2014/wpilib/BUILD b/y2014/wpilib/BUILD
index 120ff49..0f9d72e 100644
--- a/y2014/wpilib/BUILD
+++ b/y2014/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',
     '//y2014:constants',
     '//y2014/queues:auto_mode',
     '//frc971/control_loops/drivetrain:drivetrain_queue',
@@ -34,5 +34,6 @@
     '//frc971/wpilib:logging_queue',
     '//frc971/wpilib:wpilib_interface',
     '//frc971/wpilib:pdp_fetcher',
+    '//frc971/wpilib:dma',
   ],
 )

y2014/wpilib/wpilib_interface.cc

diff --git a/y2014/wpilib/wpilib_interface.cc b/y2014/wpilib/wpilib_interface.cc
index 6442a2a..5195ab6 100644
--- a/y2014/wpilib/wpilib_interface.cc
+++ b/y2014/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
@@ -49,6 +48,7 @@
 #include "frc971/wpilib/logging.q.h"
 #include "frc971/wpilib/wpilib_interface.h"
 #include "frc971/wpilib/pdp_fetcher.h"
+#include "frc971/wpilib/dma.h"
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846