commit 086cb8cc5e4bfcf1f1dc491f94e0d94233d5fedc
author Brian Silverman <brian@peloton-tech.com> Mon Oct 26 11:39:40 2015 -0400
committer Brian Silverman <brian@peloton-tech.com> Mon Oct 26 11:47:27 2015 -0400
tree 4bbe75ca004ac756d70fe8f69bd1ff27df0c21ad
parent c0401b3b21db915739749ed85f0e221ed24f30a6

Fix the Bazel targets for some messes.

All the code which uses the files that are currently split across
//aos/common and //aos/linux_code/ipc_lib now uses the correct file as a
//dependency.

Change-Id: Ida4b11f97df144da73d8e8a8a25d6f4323837dc0

aos/common/BUILD

diff --git a/aos/common/BUILD b/aos/common/BUILD
index 1691e22..e21a9fe 100644
--- a/aos/common/BUILD
+++ b/aos/common/BUILD
@@ -89,7 +89,8 @@
 )
 
 cc_library(
-  name = 'event',
+  name = 'real_event',
+  visibility = ['//aos/linux_code/ipc_lib:__pkg__'],
   hdrs = [
     'event.h',
   ],
@@ -99,6 +100,15 @@
 )
 
 cc_library(
+  # Use this one!
+  # TODO(Brian): Remove this mess...
+  name = 'event',
+  deps = [
+    '//aos/linux_code/ipc_lib:event',
+  ],
+)
+
+cc_library(
   name = 'unique_malloc_ptr',
   hdrs = [
     'unique_malloc_ptr.h',
@@ -301,19 +311,29 @@
   ],
   deps = [
     '//aos/testing:googletest',
-    '//aos/linux_code/ipc_lib:event',
+    ':event',
     ':queue_testutils',
     ':time',
   ],
 )
 
 cc_library(
-  name = 'condition',
+  name = 'real_condition',
+  visibility = ['//aos/linux_code/ipc_lib:__pkg__'],
   hdrs = [
     'condition.h',
   ],
 )
 
+cc_library(
+  # Use this one!
+  # TODO(Brian): Remove this mess...
+  name = 'condition',
+  deps = [
+    '//aos/linux_code/ipc_lib:condition',
+  ],
+)
+
 cc_test(
   name = 'condition_test',
   srcs = [
@@ -321,7 +341,7 @@
   ],
   deps = [
     '//aos/testing:googletest',
-    '//aos/linux_code/ipc_lib:condition',
+    ':condition',
     '//aos/common/util:thread',
     ':time',
     '//aos/linux_code/ipc_lib:mutex',

aos/common/actions/BUILD

diff --git a/aos/common/actions/BUILD b/aos/common/actions/BUILD
index 6669ef1..de13464 100644
--- a/aos/common/actions/BUILD
+++ b/aos/common/actions/BUILD
@@ -54,6 +54,6 @@
     '//aos/common:queues',
     '//aos/common:time',
     ':action_queue',
-    '//aos/linux_code/ipc_lib:event',
+    '//aos/common:event',
   ],
 )

aos/linux_code/ipc_lib/BUILD

diff --git a/aos/linux_code/ipc_lib/BUILD b/aos/linux_code/ipc_lib/BUILD
index 47b9e8e..576774e 100644
--- a/aos/linux_code/ipc_lib/BUILD
+++ b/aos/linux_code/ipc_lib/BUILD
@@ -125,12 +125,13 @@
 
 cc_library(
   name = 'condition',
+  visibility = ['//aos/common:__pkg__'],
   srcs = [
     'condition.cc',
   ],
   deps = [
     ':mutex',
-    '//aos/common:condition',
+    '//aos/common:real_condition',
     ':aos_sync',
     '//aos/common/logging:logging_interface',
   ],
@@ -151,12 +152,13 @@
 
 cc_library(
   name = 'event',
+  visibility = ['//aos/common:__pkg__'],
   srcs = [
     'event.cc',
   ],
   deps = [
     ':aos_sync',
     '//aos/common/logging:logging_interface',
-    '//aos/common:event',
+    '//aos/common:real_event',
   ],
 )