copying branch over from other 2013 repo
diff --git a/aos/crio/shared_libs/interrupt_bridge-tmpl.h b/aos/crio/shared_libs/interrupt_bridge-tmpl.h
index cc00ab8..fbd3e98 100644
--- a/aos/crio/shared_libs/interrupt_bridge-tmpl.h
+++ b/aos/crio/shared_libs/interrupt_bridge-tmpl.h
@@ -5,6 +5,7 @@
#include "WPILib/Task.h"
#include "aos/common/logging/logging.h"
+#include "aos/crio/motor_server/MotorServer.h"
#include "aos/common/time.h"
extern "C" {
diff --git a/aos/crio/shared_libs/interrupt_bridge.h b/aos/crio/shared_libs/interrupt_bridge.h
index 85ecd0f..f8f68b4 100644
--- a/aos/crio/shared_libs/interrupt_bridge.h
+++ b/aos/crio/shared_libs/interrupt_bridge.h
@@ -8,7 +8,7 @@
#include "aos/common/scoped_ptr.h"
-#include "aos/aos_core.h"
+#include "aos/common/macros.h"
class Task;
diff --git a/aos/crio/shared_libs/interrupt_bridge_demo.cc b/aos/crio/shared_libs/interrupt_bridge_demo.cc
index d7e66be..0755c97 100644
--- a/aos/crio/shared_libs/interrupt_bridge_demo.cc
+++ b/aos/crio/shared_libs/interrupt_bridge_demo.cc
@@ -4,7 +4,6 @@
#include "WPILib/Timer.h"
-#include "aos/aos_core.h"
#include "aos/common/time.h"
using aos::time::Time;
diff --git a/aos/crio/shared_libs/mutex.cpp b/aos/crio/shared_libs/mutex.cpp
index 35ac4e3..d921492 100644
--- a/aos/crio/shared_libs/mutex.cpp
+++ b/aos/crio/shared_libs/mutex.cpp
@@ -1,6 +1,9 @@
#include "aos/common/mutex.h"
#include <semLib.h>
+#include <string.h>
+
+#include "aos/common/logging/logging.h"
namespace aos {
diff --git a/aos/crio/shared_libs/shared_libs.gyp b/aos/crio/shared_libs/shared_libs.gyp
new file mode 100644
index 0000000..90b3cf0
--- /dev/null
+++ b/aos/crio/shared_libs/shared_libs.gyp
@@ -0,0 +1,25 @@
+{
+ 'targets': [
+ {
+# This one includes interrupt_bridge.h too.
+ 'target_name': 'interrupt_notifier',
+ 'type': 'static_library',
+ 'sources': [
+ 'interrupt_bridge.cc',
+ 'interrupt_bridge_c.c',
+ 'interrupt_bridge_demo.cc',
+ ],
+ 'dependencies': [
+ '<(AOS)/common/common.gyp:time',
+ '<(AOS)/build/aos.gyp:logging',
+ '<(EXTERNALS):WPILib',
+ '<(AOS)/common/messages/messages.gyp:aos_queues',
+ ],
+ 'export_dependent_settings': [
+ '<(AOS)/common/common.gyp:time',
+ '<(AOS)/build/aos.gyp:logging',
+ '<(EXTERNALS):WPILib',
+ ],
+ },
+ ],
+}