move joystick_proxy into aos because it's not robot-dependent
Change-Id: Ic5e1b3995bcd0ac99ee3fb1c34bae4cc1be10d4d
diff --git a/aos/prime/input/input.gyp b/aos/prime/input/input.gyp
index 4779ddc..09cfbf6 100644
--- a/aos/prime/input/input.gyp
+++ b/aos/prime/input/input.gyp
@@ -18,5 +18,16 @@
'<(AOS)/common/input/input.gyp:driver_station_data',
],
},
+ {
+ 'target_name': 'joystick_proxy',
+ 'type': 'executable',
+ 'sources': [
+ 'joystick_proxy.cc',
+ ],
+ 'dependencies': [
+ '<(AOS)/prime/input/input.gyp:joystick_input',
+ '<(AOS)/linux_code/linux_code.gyp:init',
+ ],
+ },
],
}
diff --git a/frc971/input/joystick_proxy.cc b/aos/prime/input/joystick_proxy.cc
similarity index 100%
rename from frc971/input/joystick_proxy.cc
rename to aos/prime/input/joystick_proxy.cc
diff --git a/frc971/input/input.gyp b/frc971/input/input.gyp
index 7a13291..69340d3 100644
--- a/frc971/input/input.gyp
+++ b/frc971/input/input.gyp
@@ -15,17 +15,6 @@
],
},
{
- 'target_name': 'joystick_proxy',
- 'type': 'executable',
- 'sources': [
- 'joystick_proxy.cc',
- ],
- 'dependencies': [
- '<(AOS)/prime/input/input.gyp:joystick_input',
- '<(AOS)/linux_code/linux_code.gyp:init',
- ],
- },
- {
'target_name': 'joystick_reader',
'type': 'executable',
'sources': [
diff --git a/frc971/prime/prime.gyp b/frc971/prime/prime.gyp
index e63bc3b..5a9382a 100644
--- a/frc971/prime/prime.gyp
+++ b/frc971/prime/prime.gyp
@@ -73,7 +73,7 @@
'<(DEPTH)/bbb_cape/src/bbb/bbb.gyp:uart_reader_main',
'<(DEPTH)/bbb_cape/src/bbb/bbb.gyp:test_sensor_receiver',
'../output/output.gyp:led_setter',
- '../input/input.gyp:joystick_proxy',
+ '<(AOS)/prime/input/input.gyp:joystick_proxy',
],
}
]],