commit 258b917206764f1f30759800309b60e6e66cc162
author Brian Silverman <brian@peloton-tech.com> Sat Sep 19 14:32:57 2015 -0400
committer Brian Silverman <brian@peloton-tech.com> Sat Sep 26 20:55:37 2015 -0400
tree 931f48b70a9c8f15e1b75bc2cc5e268d17d56996
parent 3e1563dcd3f0899d260984d6d24eda79389caf8c

More work cleaning up the BUILD files

Change-Id: I47fb18e7a12cd7e081631a5369274ef1e25f22c4

aos/common/BUILD

diff --git a/aos/common/BUILD b/aos/common/BUILD
index ccb9191..06ba2c6 100644
--- a/aos/common/BUILD
+++ b/aos/common/BUILD
@@ -18,6 +18,7 @@
     'queue_testutils.h',
   ],
   deps = [
+    '//aos/testing:googletest',
     '//aos/common/logging',
     ':once',
     '//aos/linux_code/ipc_lib:shared_mem',
@@ -56,16 +57,24 @@
 )
 
 cc_library(
+  name = 'generated_queue_headers',
+  visibility = ['//aos/common/logging:__pkg__'],
+  hdrs = [
+    ':gen_queue_primitives',
+  ],
+)
+
+cc_library(
   name = 'queue_types',
   srcs = [
     'queue_types.cc',
-    ':gen_queue_primitives',
     ':gen_print_field',
   ],
   hdrs = [
     'queue_types.h',
   ],
   deps = [
+    ':generated_queue_headers',
     '//aos/common/logging:logging_interface',
     '//aos/linux_code/ipc_lib:shared_mem',
     '//aos/linux_code/ipc_lib:core_lib',
@@ -81,7 +90,7 @@
   ],
   deps = [
     ':queue_types',
-    '//third_party/gtest',
+    '//aos/testing:googletest',
     ':test_queue',
     '//aos/common/logging',
     ':queue_testutils',
@@ -115,7 +124,7 @@
     'queue_test.cc',
   ],
   deps = [
-    '//third_party/gtest',
+    '//aos/testing:googletest',
     ':queue_testutils',
     ':test_queue',
     '//aos/common/util:thread',
@@ -129,7 +138,7 @@
     'type_traits_test.cpp',
   ],
   deps = [
-    '//third_party/gtest',
+    '//aos/testing:googletest',
   ],
 )
 
@@ -150,7 +159,7 @@
     'once_test.cc',
   ],
   deps = [
-    '//third_party/gtest',
+    '//aos/testing:googletest',
     ':once',
   ],
 )
@@ -161,7 +170,7 @@
     'time_test.cc',
   ],
   deps = [
-    '//third_party/gtest',
+    '//aos/testing:googletest',
     ':time',
     '//aos/common/logging',
     '//aos/common/util:death_test_log_implementation',
@@ -187,7 +196,7 @@
     'queue_testutils_test.cc',
   ],
   deps = [
-    '//third_party/gtest',
+    '//aos/testing:googletest',
     ':queue_testutils',
     '//aos/common/logging',
   ],
@@ -199,7 +208,7 @@
     'mutex_test.cc',
   ],
   deps = [
-    '//third_party/gtest',
+    '//aos/testing:googletest',
     '//aos/linux_code/ipc_lib:mutex',
     ':die',
     '//aos/common/logging',
@@ -216,8 +225,8 @@
     'event_test.cc',
   ],
   deps = [
-    '//third_party/gtest',
-    ':event',
+    '//aos/testing:googletest',
+    '//aos/linux_code/ipc_lib:event',
     ':queue_testutils',
     ':time',
   ],
@@ -229,8 +238,8 @@
     'condition_test.cc',
   ],
   deps = [
-    '//third_party/gtest',
-    ':condition',
+    '//aos/testing:googletest',
+    '//aos/linux_code/ipc_lib:condition',
     '//aos/common/util:thread',
     ':time',
     '//aos/linux_code/ipc_lib:mutex',
@@ -248,7 +257,7 @@
     'die_test.cc',
   ],
   deps = [
-    '//third_party/gtest',
+    '//aos/testing:googletest',
     ':die',
   ],
 )
@@ -268,7 +277,7 @@
   ],
   deps = [
     ':stl_mutex',
-    '//third_party/gtest',
+    '//aos/testing:googletest',
     ':queue_testutils',
     '//aos/common/util:thread',
     ':die',