cleaned up LOTS of build-related stuff
There were a lot of things that were relying on transitive #include
and/or gyp dependencies that I fixed.
I also got rid of all references to libaos and a lot of references to
aos/aos_core.h and its build target.
This in preparation for removing libaos completely.
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index 2151064..78488b6 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -38,6 +38,7 @@
# providing a logging interface.
# '<(AOS)/build/aos.gyp:logging',
'<(AOS)/build/aos.gyp:aos/ResourceList.h',
+ 'mutex',
],
},
{
@@ -95,6 +96,19 @@
],
},
{
+ 'target_name': 'scoped_fd',
+ 'type': 'static_library',
+ 'sources': [
+ # 'scoped_fd.h'
+ ],
+ 'dependencies': [
+ '<(AOS)/build/aos.gyp:logging',
+ ],
+ 'export_dependent_settings': [
+ '<(AOS)/build/aos.gyp:logging',
+ ],
+ },
+ {
'target_name': 'control_loop_queues',
'type': 'static_library',
'sources': [ '<(AOS)/common/control_loop/control_loops.q' ],
@@ -103,7 +117,6 @@
},
'dependencies': [
'<(AOS)/common/common.gyp:queues',
- '<(AOS)/common/common.gyp:queues',
],
'includes': ['../build/queues.gypi'],
},
@@ -115,7 +128,6 @@
],
'variables': {'no_rsync': 1},
'dependencies': [
- '<(AOS)/build/aos.gyp:aos_shared_lib',
],
'direct_dependent_settings': {
'variables': {
@@ -125,7 +137,6 @@
},
},
'export_dependent_settings': [
- '<(AOS)/build/aos.gyp:aos_shared_lib',
],
},
{
@@ -135,8 +146,8 @@
'control_loop/Timing.cpp'
],
'dependencies': [
- '<(AOS)/build/aos.gyp:libaos',
'<(AOS)/build/aos.gyp:logging',
+ 'time',
],
},
{
@@ -162,13 +173,11 @@
'target_name': 'queue_test',
'type': 'executable',
'sources': [
- '<(AOS)/common/queue_test.cc',
+ 'queue_test.cc',
],
'dependencies': [
'<(EXTERNALS):gtest',
- '<(AOS)/build/aos.gyp:libaos',
'queue_testutils',
- 'common',
'queue_test_queue',
'<(AOS)/common/util/util.gyp:thread',
],
@@ -181,8 +190,6 @@
],
'dependencies': [
'<(EXTERNALS):gtest',
- '<(AOS)/build/aos.gyp:libaos',
- ':common',
],
},
{
@@ -213,7 +220,7 @@
],
'dependencies': [
'<(EXTERNALS):gtest',
- '<(AOS)/build/aos.gyp:libaos',
+ 'once',
],
},
{
@@ -224,7 +231,8 @@
],
'dependencies': [
'<(EXTERNALS):gtest',
- '<(AOS)/build/aos.gyp:libaos',
+ 'time',
+ '<(AOS)/build/aos.gyp:logging',
],
},
{
@@ -254,6 +262,11 @@
],
}],
],
+ 'dependencies': [
+ # TODO(aschuh): Fix this dependency loop by
+ # providing a logging interface.
+ # '<(AOS)/build/aos.gyp:logging',
+ ],
},
{
'target_name': 'mutex_test',
@@ -263,7 +276,8 @@
],
'dependencies': [
'<(EXTERNALS):gtest',
- '<(AOS)/build/aos.gyp:libaos',
+ 'mutex',
+ '<(AOS)/build/aos.gyp:logging',
],
},
{
@@ -274,7 +288,7 @@
],
'dependencies': [
'<(EXTERNALS):gtest',
- '<(AOS)/build/aos.gyp:libaos',
+ 'die',
],
},
],
diff --git a/aos/common/network/ReceiveSocket.cpp b/aos/common/network/ReceiveSocket.cpp
index c754f32..d98be54 100644
--- a/aos/common/network/ReceiveSocket.cpp
+++ b/aos/common/network/ReceiveSocket.cpp
@@ -6,7 +6,7 @@
#include <stddef.h>
#include "aos/common/network/SocketLibraries.h"
-#include "aos/aos_core.h"
+#include "aos/common/logging/logging.h"
namespace aos {
diff --git a/aos/common/network/SendSocket.cpp b/aos/common/network/SendSocket.cpp
index c30ec32..59fd570 100644
--- a/aos/common/network/SendSocket.cpp
+++ b/aos/common/network/SendSocket.cpp
@@ -6,8 +6,8 @@
#include <stddef.h>
#include <math.h>
-#include "aos/aos_core.h"
#include "aos/common/network/SocketLibraries.h"
+#include "aos/common/logging/logging.h"
namespace aos {
diff --git a/aos/common/network/network.gyp b/aos/common/network/network.gyp
index a41509d..4fc3a09 100644
--- a/aos/common/network/network.gyp
+++ b/aos/common/network/network.gyp
@@ -10,10 +10,9 @@
'Socket.cpp',
],
'dependencies': [
- '<(AOS)/build/aos.gyp:aos_shared_lib',
+ '<(AOS)/build/aos.gyp:logging',
],
'export_dependent_settings': [
- '<(AOS)/build/aos.gyp:aos_shared_lib',
],
'conditions': [
['OS=="crio"', {
diff --git a/aos/common/scoped_fd.h b/aos/common/scoped_fd.h
index e654d3d..f31ffa5 100644
--- a/aos/common/scoped_fd.h
+++ b/aos/common/scoped_fd.h
@@ -1,4 +1,5 @@
#include "aos/common/macros.h"
+#include "aos/common/logging/logging.h"
namespace aos {