Get stuff building with newer Bazel with sandboxing
After this, a newer version of Bazel is required to build the code.
201511240708+4433fa6 is the first version which will work.
Change-Id: Ifc41f11f2f21bdcd0f5f7d142d769ea8fa15921a
diff --git a/aos/externals/BUILD b/aos/externals/BUILD
index e42db6c..55b85d4 100644
--- a/aos/externals/BUILD
+++ b/aos/externals/BUILD
@@ -16,27 +16,31 @@
'allwpilib/wpilibc/wpilibC++Devices/src/Internal/*.cpp',
'allwpilib/hal/lib/Athena/*.cpp',
'allwpilib/hal/lib/Athena/ctre/*.cpp',
+ ], [
+ # This looks like an older version of the file, so we want to use the other
+ # one.
+ 'allwpilib/wpilibc/wpilibC++Devices/include/NetworkCommunication/FRCComm.h',
]) + [
+ 'allwpilib/hal/lib/Athena/NetworkCommunication/FRCComm.h',
'forwpilib/dma.cc',
+ 'allwpilib/ni-libraries/libFRC_NetworkCommunication.so.1.5.0',
+ 'allwpilib/ni-libraries/libRoboRIO_FRC_ChipObject.so.1.2.0',
+ 'allwpilib/ni-libraries/libNiFpgaLv.so.14.0.0',
+ 'allwpilib/ni-libraries/libNiFpga.so.14.0.0',
+ 'allwpilib/ni-libraries/libNiRioSrv.so.14.0.0',
+ 'allwpilib/ni-libraries/libspi.so.1.0.0',
+ 'allwpilib/ni-libraries/libi2c.so.1.0.0',
+ ],
+ defines = [
+ 'WPILIB2015=1',
],
copts = [
'-Wno-error',
],
- hdrs = glob([d + '/*.h' for d in _header_dirs]),
+ hdrs = glob([d + '/**/*.h' for d in _header_dirs] + [d + '/**/*.hpp' for d in _header_dirs]),
includes = _header_dirs,
linkopts = [
- '-Laos/externals/allwpilib/ni-libraries',
'-lpthread',
- '-lFRC_NetworkCommunication',
- '-lRoboRIO_FRC_ChipObject',
- '-lNiFpgaLv',
- '-lNiFpga',
- '-lNiRioSrv',
- '-lspi',
- '-li2c',
- ],
- defines = [
- 'WPILIB2015=1',
],
)