removing old hacks for the cRIO
diff --git a/aos/build/aos.gypi b/aos/build/aos.gypi
index c2c0813..150aa65 100644
--- a/aos/build/aos.gypi
+++ b/aos/build/aos.gypi
@@ -15,10 +15,6 @@
'so_dir': '<(PRODUCT_DIR)/lib',
# the directory that executables that depend on <(EXTERNALS):gtest get put into
'test_dir': '<(PRODUCT_DIR)/tests',
-# 'executable' for linux and 'static_library' for the cRIO
-# Useful for targets that should either be an executable or get compiled into
-# a .out file depending on the current platform.
-# 'aos_target': platform-dependent,
},
'conditions': [
['OS=="crio"', {
@@ -26,9 +22,6 @@
['CC', '<!(readlink -f <(AOS)/build/crio_cc)'],
['CXX', '<!(readlink -f <(AOS)/build/crio_cxx)'],
],
- 'variables': {
- 'aos_target': 'static_library',
- },
}, {
'conditions': [
['PLATFORM!="linux-amd64"', {
@@ -39,9 +32,6 @@
},
],
],
- 'variables': {
- 'aos_target': 'executable',
- },
}
],
],
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index 1f6a274..0f904ea 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -235,7 +235,7 @@
},
{
'target_name': 'type_traits_test',
- 'type': '<(aos_target)',
+ 'type': 'executable',
'sources': [
'type_traits_test.cpp',
],
@@ -265,7 +265,7 @@
},
{
'target_name': 'once_test',
- 'type': '<(aos_target)',
+ 'type': 'executable',
'sources': [
'once_test.cc',
],
@@ -276,7 +276,7 @@
},
{
'target_name': 'time_test',
- 'type': '<(aos_target)',
+ 'type': 'executable',
'sources': [
'time_test.cc',
],
@@ -335,7 +335,7 @@
},
{
'target_name': 'mutex_test',
- 'type': '<(aos_target)',
+ 'type': 'executable',
'sources': [
'mutex_test.cpp',
],
diff --git a/aos/common/logging/logging.gyp b/aos/common/logging/logging.gyp
index 0139784..36d58b7 100644
--- a/aos/common/logging/logging.gyp
+++ b/aos/common/logging/logging.gyp
@@ -2,7 +2,7 @@
'targets': [
{
'target_name': 'logging_impl_test',
- 'type': '<(aos_target)',
+ 'type': 'executable',
'sources': [
'logging_impl_test.cc',
],
diff --git a/frc971/output/output.gyp b/frc971/output/output.gyp
index 6faca12..67bd641 100644
--- a/frc971/output/output.gyp
+++ b/frc971/output/output.gyp
@@ -24,7 +24,7 @@
},
{
'target_name': 'motor_writer',
- 'type': '<(aos_target)',
+ 'type': 'executable',
'sources': [
'motor_writer.cc'
],