moved stuff to where it belongs
diff --git a/aos/common/network/SendSocket.h b/aos/common/network/SendSocket.h
index 06529d0..1ca0c4c 100644
--- a/aos/common/network/SendSocket.h
+++ b/aos/common/network/SendSocket.h
@@ -5,7 +5,7 @@
#include "aos/linux_code/configuration.h"
#include "aos/common/network_port.h"
-#include "aos/common/util.h"
+#include "aos/common/util/inet_addr.h"
namespace aos {
diff --git a/aos/common/network/network.gyp b/aos/common/network/network.gyp
index 4d5aff3..c254c93 100644
--- a/aos/common/network/network.gyp
+++ b/aos/common/network/network.gyp
@@ -13,35 +13,6 @@
],
},
{
- 'target_name': 'socket_so',
- 'type': 'shared_library',
- 'variables': {'no_rsync': 1},
- 'sources': [
- 'ReceiveSocket.cpp',
- 'SendSocket.cpp',
- 'Socket.cpp',
- ],
- 'dependencies': [
- '<(AOS)/build/aos.gyp:logging',
- ],
- 'export_dependent_settings': [
- ],
- 'conditions': [
- ['OS=="crio"', {
- 'dependencies': [
- '<(EXTERNALS):WPILib',
- ]}
- ],
- ],
- 'direct_dependent_settings': {
- 'variables': {
- 'jni_libs': [
- 'socket_so',
- ],
- },
- },
- },
- {
'target_name': 'socket',
'type': 'static_library',
'sources': [
@@ -52,7 +23,7 @@
'dependencies': [
'<(AOS)/build/aos.gyp:logging',
'<(AOS)/common/common.gyp:time',
- '<(AOS)/common/common.gyp:util',
+ '<(AOS)/common/util/util.gyp:inet_addr',
'<(AOS)/linux_code/linux_code.gyp:configuration',
],
'export_dependent_settings': [