commit 2200b2c347ee50c6a39db9ee61d8bd2fe770cd66
author Brian Silverman <brians> Sun Nov 29 05:59:28 2015 +0000
committer Brian Silverman <brians> Sun Nov 29 05:59:28 2015 +0000
tree 2150c0576f6dff01ebf04fad39a11a7a55a4afb0
parent ea14a6f2e7e028e716d4dd0b1276fbc8a9ec1665

Move some .cc files next to their corresponding headers

Change-Id: I8a6bbdc7edeb8b6d746f08f593b1655e7260cd03

aos/common/BUILD

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',
   ],
 )