More work on translating GYP build information to Bazel.
Change-Id: If770ebeb54ddc4ca1af2e971734ad243c608cd45
diff --git a/aos/common/BUILD b/aos/common/BUILD
index 919c2a0..ccb9191 100644
--- a/aos/common/BUILD
+++ b/aos/common/BUILD
@@ -21,7 +21,7 @@
'//aos/common/logging',
':once',
'//aos/linux_code/ipc_lib:shared_mem',
- ':mutex',
+ '//aos/linux_code/ipc_lib:mutex',
],
)
@@ -35,14 +35,32 @@
],
deps = [
'//aos/common/logging:logging_interface',
- ':mutex',
+ '//aos/linux_code/ipc_lib:mutex',
],
)
+genrule(
+ name = 'gen_queue_primitives',
+ visibility = ['//visibility:private'],
+ tools = ['//aos/build/queues:queue_primitives'],
+ outs = ['queue_primitives.h'],
+ cmd = '$(location //aos/build/queues:queue_primitives) $@',
+)
+
+genrule(
+ name = 'gen_print_field',
+ visibility = ['//visibility:private'],
+ tools = ['//aos/build/queues:print_field'],
+ outs = ['print_field.cc'],
+ cmd = '$(location //aos/build/queues:print_field) $@',
+)
+
cc_library(
name = 'queue_types',
srcs = [
'queue_types.cc',
+ ':gen_queue_primitives',
+ ':gen_print_field',
],
hdrs = [
'queue_types.h',
@@ -51,7 +69,7 @@
'//aos/common/logging:logging_interface',
'//aos/linux_code/ipc_lib:shared_mem',
'//aos/linux_code/ipc_lib:core_lib',
- ':mutex',
+ '//aos/linux_code/ipc_lib:mutex',
':time',
],
)
@@ -182,7 +200,7 @@
],
deps = [
'//third_party/gtest',
- ':mutex',
+ '//aos/linux_code/ipc_lib:mutex',
':die',
'//aos/common/logging',
'//aos/common/util:death_test_log_implementation',
@@ -215,13 +233,12 @@
':condition',
'//aos/common/util:thread',
':time',
- ':mutex',
+ '//aos/linux_code/ipc_lib:mutex',
'//aos/common/logging',
':queue_testutils',
'//aos/linux_code/ipc_lib:core_lib',
'//aos/linux_code/ipc_lib:aos_sync',
':die',
- '//aos/common/util:thread',
],
)
diff --git a/aos/common/logging/BUILD b/aos/common/logging/BUILD
index db7f365..82aaf16 100644
--- a/aos/common/logging/BUILD
+++ b/aos/common/logging/BUILD
@@ -41,3 +41,30 @@
'//third_party/eigen',
],
)
+
+cc_library(
+ name = 'logging_interface',
+ srcs = [
+ 'logging_interface.cc',
+ ],
+ deps = [
+ '//aos/linux_code/logging:linux_interface',
+ '//aos/common:die',
+ '//aos/common/libc:aos_strerror',
+ ],
+)
+
+cc_library(
+ name = 'logging',
+ srcs = [
+ 'logging_impl.cc',
+ 'linux_logging.cc',
+ ],
+ deps = [
+ '//aos/linux_code/logging:linux_logging',
+ '//aos/common:time',
+ '//aos/common:once',
+ ':logging_interface',
+ '//aos/common:queue_types',
+ ],
+)
diff --git a/aos/linux_code/ipc_lib/BUILD b/aos/linux_code/ipc_lib/BUILD
index c511968..75e3d95 100644
--- a/aos/linux_code/ipc_lib/BUILD
+++ b/aos/linux_code/ipc_lib/BUILD
@@ -103,3 +103,37 @@
':queue',
],
)
+
+cc_library(
+ name = 'condition',
+ srcs = [
+ 'condition.cc',
+ ],
+ deps = [
+ ':mutex',
+ ':aos_sync',
+ '//aos/common/logging:logging_interface',
+ ],
+)
+
+cc_library(
+ name = 'mutex',
+ srcs = [
+ 'mutex.cc',
+ ],
+ deps = [
+ ':aos_sync',
+ '//aos/common/logging:logging_interface',
+ ],
+)
+
+cc_library(
+ name = 'event',
+ srcs = [
+ 'event.cc',
+ ],
+ deps = [
+ ':aos_sync',
+ '//aos/common/logging:logging_interface',
+ ],
+)
diff --git a/aos/linux_code/logging/BUILD b/aos/linux_code/logging/BUILD
index a35cd0e..29c6d78 100644
--- a/aos/linux_code/logging/BUILD
+++ b/aos/linux_code/logging/BUILD
@@ -70,3 +70,27 @@
'//aos/common/logging',
],
)
+
+cc_library(
+ name = 'linux_interface',
+ visibility = ['//aos/common/logging:__pkg__'],
+ srcs = [
+ 'linux_interface.cc',
+ ],
+ deps = [
+ '//aos/linux_code:complex_thread_local',
+ '//aos/common:die',
+ ],
+)
+
+cc_library(
+ name = 'linux_logging',
+ visibility = ['//aos/common/logging:__pkg__'],
+ srcs = [
+ 'linux_logging.cc',
+ ],
+ deps = [
+ '//aos/linux_code/ipc_lib:queue',
+ '//aos/common:time',
+ ],
+)