cleaned up LOTS of build-related stuff
There were a lot of things that were relying on transitive #include
and/or gyp dependencies that I fixed.
I also got rid of all references to libaos and a lot of references to
aos/aos_core.h and its build target.
This in preparation for removing libaos completely.
diff --git a/frc971/autonomous/auto.cc b/frc971/autonomous/auto.cc
index 1a2a46a..424f5ef 100644
--- a/frc971/autonomous/auto.cc
+++ b/frc971/autonomous/auto.cc
@@ -1,11 +1,12 @@
#include "stdio.h"
-#include "aos/aos_core.h"
#include "aos/common/control_loop/Timing.h"
#include "aos/common/time.h"
#include "aos/common/util/trapezoid_profile.h"
-#include "frc971/autonomous/auto.q.h"
#include "aos/common/messages/RobotState.q.h"
+#include "aos/common/logging/logging.h"
+
+#include "frc971/autonomous/auto.q.h"
#include "frc971/constants.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
#include "frc971/control_loops/wrist/wrist_motor.q.h"
diff --git a/frc971/autonomous/auto_main.cc b/frc971/autonomous/auto_main.cc
index 7102da9..8ce82f8 100644
--- a/frc971/autonomous/auto_main.cc
+++ b/frc971/autonomous/auto_main.cc
@@ -1,8 +1,9 @@
#include "stdio.h"
-#include "aos/aos_core.h"
#include "aos/common/control_loop/Timing.h"
#include "aos/common/time.h"
+#include "aos/atom_code/init.h"
+#include "aos/common/logging/logging.h"
#include "frc971/autonomous/auto.q.h"
#include "frc971/autonomous/auto.h"
diff --git a/frc971/autonomous/autonomous.gyp b/frc971/autonomous/autonomous.gyp
index 229ab40..cd8ce9c 100644
--- a/frc971/autonomous/autonomous.gyp
+++ b/frc971/autonomous/autonomous.gyp
@@ -8,11 +8,9 @@
'header_path': 'frc971/autonomous',
},
'dependencies': [
- '<(AOS)/build/aos.gyp:libaos',
'<(AOS)/common/common.gyp:queues',
],
'export_dependent_settings': [
- '<(AOS)/build/aos.gyp:libaos',
'<(AOS)/common/common.gyp:queues',
],
'includes': ['../../aos/build/queues.gypi'],
@@ -24,7 +22,6 @@
'auto.cc',
],
'dependencies': [
- '<(AOS)/build/aos.gyp:libaos',
'auto_queue',
'<(AOS)/common/common.gyp:controls',
'<(DEPTH)/frc971/control_loops/wrist/wrist.gyp:wrist_loop',
@@ -36,6 +33,7 @@
'<(AOS)/common/common.gyp:time',
'<(AOS)/common/common.gyp:timing',
'<(AOS)/common/util/util.gyp:trapezoid_profile',
+ '<(AOS)/build/aos.gyp:logging',
],
'export_dependent_settings': [
'<(AOS)/common/common.gyp:controls',