Move some .cc files next to their corresponding headers
Change-Id: I8a6bbdc7edeb8b6d746f08f593b1655e7260cd03
diff --git a/aos/common/BUILD b/aos/common/BUILD
index 4262b60..4d0127b 100644
--- a/aos/common/BUILD
+++ b/aos/common/BUILD
@@ -30,7 +30,7 @@
'//aos/testing:googletest',
'//aos/common/logging',
'//aos/linux_code/ipc_lib:shared_mem',
- '//aos/linux_code/ipc_lib:mutex',
+ ':mutex',
],
)
@@ -58,7 +58,7 @@
],
deps = [
'//aos/common/logging:logging_interface',
- '//aos/linux_code/ipc_lib:mutex',
+ ':mutex',
':macros',
'//aos/linux_code/ipc_lib:shared_mem',
],
@@ -89,23 +89,17 @@
)
cc_library(
- name = 'real_event',
- visibility = ['//aos/linux_code/ipc_lib:__pkg__'],
+ name = 'event',
hdrs = [
'event.h',
],
+ srcs = [
+ 'event.cc',
+ ],
deps = [
'//aos/linux_code/ipc_lib:aos_sync',
':time',
- ],
-)
-
-cc_library(
- # Use this one!
- # TODO(Brian): Remove this mess...
- name = 'event',
- deps = [
- '//aos/linux_code/ipc_lib:event',
+ '//aos/common/logging:logging_interface',
],
)
@@ -130,7 +124,7 @@
':generated_queue_headers',
'//aos/linux_code/ipc_lib:shared_mem',
'//aos/linux_code/ipc_lib:core_lib',
- '//aos/linux_code/ipc_lib:mutex',
+ ':mutex',
'//aos/common/logging:logging_printf_formats',
':time',
':byteorder'
@@ -295,7 +289,7 @@
],
deps = [
'//aos/testing:googletest',
- '//aos/linux_code/ipc_lib:mutex',
+ ':mutex',
':die',
'//aos/common/logging',
'//aos/common/util:death_test_log_implementation',
@@ -319,19 +313,17 @@
)
cc_library(
- name = 'real_condition',
- visibility = ['//aos/linux_code/ipc_lib:__pkg__'],
+ name = 'condition',
hdrs = [
'condition.h',
],
-)
-
-cc_library(
- # Use this one!
- # TODO(Brian): Remove this mess...
- name = 'condition',
+ srcs = [
+ 'condition.cc',
+ ],
deps = [
- '//aos/linux_code/ipc_lib:condition',
+ ':mutex',
+ '//aos/linux_code/ipc_lib:aos_sync',
+ '//aos/common/logging:logging_interface',
],
)
@@ -345,7 +337,7 @@
':condition',
'//aos/common/util:thread',
':time',
- '//aos/linux_code/ipc_lib:mutex',
+ ':mutex',
'//aos/common/logging',
':queue_testutils',
'//aos/linux_code/ipc_lib:core_lib',
@@ -381,9 +373,14 @@
hdrs = [
'mutex.h',
],
+ srcs = [
+ 'mutex.cc',
+ ],
deps = [
'//aos/linux_code/ipc_lib:aos_sync',
':die',
+ '//aos/common/logging:logging_interface',
+ ':type_traits',
],
)
diff --git a/aos/linux_code/ipc_lib/condition.cc b/aos/common/condition.cc
similarity index 100%
rename from aos/linux_code/ipc_lib/condition.cc
rename to aos/common/condition.cc
diff --git a/aos/linux_code/ipc_lib/event.cc b/aos/common/event.cc
similarity index 100%
rename from aos/linux_code/ipc_lib/event.cc
rename to aos/common/event.cc
diff --git a/aos/linux_code/ipc_lib/mutex.cc b/aos/common/mutex.cc
similarity index 100%
rename from aos/linux_code/ipc_lib/mutex.cc
rename to aos/common/mutex.cc
diff --git a/aos/linux_code/ipc_lib/BUILD b/aos/linux_code/ipc_lib/BUILD
index 576774e..2b90c34 100644
--- a/aos/linux_code/ipc_lib/BUILD
+++ b/aos/linux_code/ipc_lib/BUILD
@@ -67,8 +67,8 @@
'queue.h',
],
deps = [
- '//aos/linux_code/ipc_lib:condition',
- '//aos/linux_code/ipc_lib:mutex',
+ '//aos/common:condition',
+ '//aos/common:mutex',
':core_lib',
':shared_mem',
'//aos/common/logging:logging_interface',
@@ -107,7 +107,7 @@
'//aos/testing:googletest',
'//aos/common:time',
'//aos/common:queue_testutils',
- '//aos/linux_code/ipc_lib:mutex',
+ '//aos/common:mutex',
':core_lib',
'//aos/common:die',
'//aos/common/libc:dirname',
@@ -122,43 +122,3 @@
':queue',
],
)
-
-cc_library(
- name = 'condition',
- visibility = ['//aos/common:__pkg__'],
- srcs = [
- 'condition.cc',
- ],
- deps = [
- ':mutex',
- '//aos/common:real_condition',
- ':aos_sync',
- '//aos/common/logging:logging_interface',
- ],
-)
-
-cc_library(
- name = 'mutex',
- srcs = [
- 'mutex.cc',
- ],
- deps = [
- ':aos_sync',
- '//aos/common/logging:logging_interface',
- '//aos/common:type_traits',
- '//aos/common:mutex',
- ],
-)
-
-cc_library(
- name = 'event',
- visibility = ['//aos/common:__pkg__'],
- srcs = [
- 'event.cc',
- ],
- deps = [
- ':aos_sync',
- '//aos/common/logging:logging_interface',
- '//aos/common:real_event',
- ],
-)
diff --git a/frc971/wpilib/BUILD b/frc971/wpilib/BUILD
index 9417159..a47fbc4 100644
--- a/frc971/wpilib/BUILD
+++ b/frc971/wpilib/BUILD
@@ -22,7 +22,7 @@
':dma_edge_counting',
'//aos/linux_code:init',
'//aos/common/logging',
- '//aos/linux_code/ipc_lib:mutex',
+ '//aos/common:mutex',
],
)