remove all the crio, bbb, and 2014 code
This also meant upgrading to clang-3.5 from llvm.org to try to get it to
build code for the roboRIO.
Change-Id: I44df4af4e9e04296ee7934cc787da3101b1ac449
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index 9a63e48..693f717 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -118,25 +118,12 @@
'sources': [
'queue.cc',
],
- 'conditions': [
- ['PLATFORM=="crio"', {
- 'dependencies': [
- '<(EXTERNALS):WPILib',
- ],
- },
- {
- 'dependencies': [
- '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:queue',
- ],
- 'export_dependent_settings': [
- '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:queue',
- ],
- }]
- ],
'dependencies': [
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:queue',
'time',
],
'export_dependent_settings': [
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:queue',
'time',
],
},
@@ -253,26 +240,16 @@
{
'target_name': 'mutex',
'type': 'static_library',
- 'conditions': [
- ['PLATFORM=="crio"', {
- 'sources': [
- '<(AOS)/crio/shared_libs/mutex.cpp',
- ],
- }, {
- 'sources': [
- '<(AOS)/linux_code/ipc_lib/mutex.cpp',
- ],
- 'dependencies': [
- '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:aos_sync',
- ],
- 'export_dependent_settings': [
- '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:aos_sync',
- ],
- }],
+ 'sources': [
+ '<(AOS)/linux_code/ipc_lib/mutex.cpp',
],
'dependencies': [
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:aos_sync',
'<(AOS)/build/aos.gyp:logging_interface',
],
+ 'export_dependent_settings': [
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:aos_sync',
+ ],
},
{
'target_name': 'mutex_test',