Use sandboxed clang
Change-Id: I0b9b5b7940b441aba6c6214e621d8997feef90b1
diff --git a/aos/build/queues/BUILD b/aos/build/queues/BUILD
index b75d12f..b3ec3f6 100644
--- a/aos/build/queues/BUILD
+++ b/aos/build/queues/BUILD
@@ -17,6 +17,9 @@
deps = [
':lib',
],
+ data = [
+ '@clang_3p6_repo//:clang-format',
+ ],
)
ruby_binary(
diff --git a/aos/build/queues/compiler.rb b/aos/build/queues/compiler.rb
index 5164670..f47763d 100644
--- a/aos/build/queues/compiler.rb
+++ b/aos/build/queues/compiler.rb
@@ -77,7 +77,9 @@
end
def format_pipeline(output)
read_in, write_in = IO.pipe()
- child = Process.spawn('/usr/bin/clang-format-3.5 --style=google',
+ # TODO(phil): Is there a better way to use the sandboxed clang-format here?
+ child = Process.spawn({'LD_LIBRARY_PATH' => './bazel-out/host/bin/aos/build/queues/compiler.runfiles/org_frc971/external/clang_3p6_repo/usr/lib/x86_64-linux-gnu'},
+ './bazel-out/host/bin/aos/build/queues/compiler.runfiles/org_frc971/external/clang_3p6_repo/usr/bin/clang-format-3.6 --style=google',
{:in=>read_in, write_in=>:close,
:out=>output.fileno})
read_in.close
diff --git a/aos/common/logging/BUILD b/aos/common/logging/BUILD
index cc961b3..6d0d956 100644
--- a/aos/common/logging/BUILD
+++ b/aos/common/logging/BUILD
@@ -1,194 +1,194 @@
# The primary client logging interface.
cc_library(
- name = 'logging',
- visibility = ['//visibility:public'],
- hdrs = [
- 'logging.h',
- 'interface.h',
- 'context.h',
- ],
- srcs = [
- 'interface.cc',
- 'context.cc',
- ],
- deps = [
- '//aos/common:die',
- '//aos/common/libc:aos_strerror',
- '//aos/common:macros',
- '//aos/linux_code:complex_thread_local',
- ':sizes',
- ],
+ name = "logging",
+ srcs = [
+ "context.cc",
+ "interface.cc",
+ ],
+ hdrs = [
+ "context.h",
+ "interface.h",
+ "logging.h",
+ ],
+ visibility = ["//visibility:public"],
+ deps = [
+ ":sizes",
+ "//aos/common:die",
+ "//aos/common:macros",
+ "//aos/common/libc:aos_strerror",
+ "//aos/linux_code:complex_thread_local",
+ ],
)
cc_library(
- name = 'replay',
- visibility = ['//visibility:public'],
- srcs = [
- 'replay.cc',
- ],
- hdrs = [
- 'replay.h',
- ],
- deps = [
- ':binary_log_file',
- '//aos/common:queues',
- ':logging',
- '//aos/linux_code/ipc_lib:queue',
- ],
+ name = "replay",
+ srcs = [
+ "replay.cc",
+ ],
+ hdrs = [
+ "replay.h",
+ ],
+ visibility = ["//visibility:public"],
+ deps = [
+ ":binary_log_file",
+ ":logging",
+ "//aos/common:queues",
+ "//aos/linux_code/ipc_lib:queue",
+ ],
)
cc_binary(
- name = 'binary_log_writer',
- visibility = ['//visibility:public'],
- srcs = [
- 'binary_log_writer.cc',
- ],
- deps = [
- ':logging',
- ':implementations',
- '//aos/linux_code:init',
- '//aos/linux_code:configuration',
- '//aos/linux_code/ipc_lib:queue',
- '//aos/common:die',
- ':binary_log_file',
- '//aos/common:queue_types',
- '//aos/common:time',
- ],
+ name = "binary_log_writer",
+ srcs = [
+ "binary_log_writer.cc",
+ ],
+ visibility = ["//visibility:public"],
+ deps = [
+ ":binary_log_file",
+ ":implementations",
+ ":logging",
+ "//aos/common:die",
+ "//aos/common:queue_types",
+ "//aos/common:time",
+ "//aos/linux_code:configuration",
+ "//aos/linux_code:init",
+ "//aos/linux_code/ipc_lib:queue",
+ ],
)
cc_binary(
- name = 'log_streamer',
- visibility = ['//visibility:public'],
- srcs = [
- 'log_streamer.cc',
- ],
- deps = [
- ':logging',
- ':implementations',
- '//aos/linux_code:init',
- '//aos/common:time',
- '//aos/linux_code/ipc_lib:queue',
- ],
+ name = "log_streamer",
+ srcs = [
+ "log_streamer.cc",
+ ],
+ visibility = ["//visibility:public"],
+ deps = [
+ ":implementations",
+ ":logging",
+ "//aos/common:time",
+ "//aos/linux_code:init",
+ "//aos/linux_code/ipc_lib:queue",
+ ],
)
cc_binary(
- name = 'log_displayer',
- visibility = ['//visibility:public'],
- srcs = [
- 'log_displayer.cc',
- ],
- deps = [
- ':logging',
- ':implementations',
- '//aos/linux_code:init',
- ':binary_log_file',
- '//aos/common:queue_types',
- '//aos/linux_code:configuration',
- '//aos/common/util:string_to_num',
- ],
+ name = "log_displayer",
+ srcs = [
+ "log_displayer.cc",
+ ],
+ visibility = ["//visibility:public"],
+ deps = [
+ ":binary_log_file",
+ ":implementations",
+ ":logging",
+ "//aos/common:queue_types",
+ "//aos/common/util:string_to_num",
+ "//aos/linux_code:configuration",
+ "//aos/linux_code:init",
+ ],
)
cc_library(
- name = 'binary_log_file',
- srcs = [
- 'binary_log_file.cc',
- ],
- hdrs = [
- 'binary_log_file.h',
- ],
- deps = [
- ':implementations',
- ],
+ name = "binary_log_file",
+ srcs = [
+ "binary_log_file.cc",
+ ],
+ hdrs = [
+ "binary_log_file.h",
+ ],
+ deps = [
+ ":implementations",
+ ],
)
cc_library(
- name = 'sizes',
- hdrs = [
- 'sizes.h',
- ],
+ name = "sizes",
+ hdrs = [
+ "sizes.h",
+ ],
)
cc_test(
- name = 'implementations_test',
- srcs = [
- 'implementations_test.cc',
- ],
- deps = [
- '//aos/testing:googletest',
- ':logging',
- ':implementations',
- ],
+ name = "implementations_test",
+ srcs = [
+ "implementations_test.cc",
+ ],
+ deps = [
+ ":implementations",
+ ":logging",
+ "//aos/testing:googletest",
+ ],
)
cc_library(
- name = 'queue_logging',
- visibility = ['//visibility:public'],
- srcs = [
- 'queue_logging.cc',
- ],
- hdrs = [
- 'queue_logging.h',
- ],
- deps = [
- ':logging',
- ':sizes',
- '//aos/common:die',
- '//aos/common:queue_types',
- ],
+ name = "queue_logging",
+ srcs = [
+ "queue_logging.cc",
+ ],
+ hdrs = [
+ "queue_logging.h",
+ ],
+ visibility = ["//visibility:public"],
+ deps = [
+ ":logging",
+ ":sizes",
+ "//aos/common:die",
+ "//aos/common:queue_types",
+ ],
)
cc_library(
- name = 'matrix_logging',
- visibility = ['//visibility:public'],
- srcs = [
- 'matrix_logging.cc',
- ],
- hdrs = [
- 'matrix_logging.h',
- ],
- deps = [
- '//aos/common:generated_queue_headers',
- ':logging',
- ':sizes',
- '//aos/common:die',
- '//aos/common:queue_types',
- '//third_party/eigen',
- ],
+ name = "matrix_logging",
+ srcs = [
+ "matrix_logging.cc",
+ ],
+ hdrs = [
+ "matrix_logging.h",
+ ],
+ visibility = ["//visibility:public"],
+ deps = [
+ ":logging",
+ ":sizes",
+ "//aos/common:die",
+ "//aos/common:generated_queue_headers",
+ "//aos/common:queue_types",
+ "//third_party/eigen",
+ ],
)
cc_library(
- name = 'printf_formats',
- visibility = ['//visibility:public'],
- hdrs = [
- 'printf_formats.h',
- ],
- deps = [
- '//aos/common:macros',
- ],
+ name = "printf_formats",
+ hdrs = [
+ "printf_formats.h",
+ ],
+ visibility = ["//visibility:public"],
+ deps = [
+ "//aos/common:macros",
+ ],
)
cc_library(
- name = 'implementations',
- visibility = ['//visibility:public'],
- srcs = [
- 'implementations.cc',
- ],
- hdrs = [
- 'implementations.h',
- ],
- linkopts = [
- '-pthread',
- ],
- deps = [
- '//aos/common:die',
- '//aos/common:time',
- '//aos:once',
- '//aos/common:queue_types',
- ':logging',
- '//aos/common:type_traits',
- '//aos/common:mutex',
- '//aos/common:macros',
- ':sizes',
- '//aos/linux_code/ipc_lib:queue',
- ],
+ name = "implementations",
+ srcs = [
+ "implementations.cc",
+ ],
+ hdrs = [
+ "implementations.h",
+ ],
+ linkopts = [
+ "-lpthread",
+ ],
+ visibility = ["//visibility:public"],
+ deps = [
+ ":logging",
+ ":sizes",
+ "//aos:once",
+ "//aos/common:die",
+ "//aos/common:macros",
+ "//aos/common:mutex",
+ "//aos/common:queue_types",
+ "//aos/common:time",
+ "//aos/common:type_traits",
+ "//aos/linux_code/ipc_lib:queue",
+ ],
)
diff --git a/aos/linux_code/BUILD b/aos/linux_code/BUILD
index 259538c..3884130 100644
--- a/aos/linux_code/BUILD
+++ b/aos/linux_code/BUILD
@@ -1,92 +1,92 @@
-package(default_visibility = ['//visibility:public'])
+package(default_visibility = ["//visibility:public"])
cc_binary(
- name = 'dump_rtprio',
- srcs = [
- 'dump_rtprio.cc',
- ],
- deps = [
- '//aos/common/logging',
- '//aos/common/logging:implementations',
- '//aos/common:time',
- ],
+ name = "dump_rtprio",
+ srcs = [
+ "dump_rtprio.cc",
+ ],
+ deps = [
+ "//aos/common:time",
+ "//aos/common/logging",
+ "//aos/common/logging:implementations",
+ ],
)
cc_library(
- name = 'queue',
- visibility = ['//aos/common:__pkg__'],
- hdrs = [
- 'queue-tmpl.h',
- ],
+ name = "queue",
+ hdrs = [
+ "queue-tmpl.h",
+ ],
+ visibility = ["//aos/common:__pkg__"],
)
cc_library(
- name = 'complex_thread_local',
- srcs = [
- 'complex_thread_local.cc',
- ],
- hdrs = [
- 'complex_thread_local.h',
- ],
- deps = [
- '//aos:once',
- '//aos/common:die',
- ],
- linkopts = [
- "-pthread",
- ],
+ name = "complex_thread_local",
+ srcs = [
+ "complex_thread_local.cc",
+ ],
+ hdrs = [
+ "complex_thread_local.h",
+ ],
+ linkopts = [
+ "-lpthread",
+ ],
+ deps = [
+ "//aos:once",
+ "//aos/common:die",
+ ],
)
cc_test(
- name = 'complex_thread_local_test',
- srcs = [
- 'complex_thread_local_test.cc',
- ],
- deps = [
- ':complex_thread_local',
- '//aos/testing:googletest',
- '//aos/common/util:thread',
- '//aos/common/logging',
- ],
+ name = "complex_thread_local_test",
+ srcs = [
+ "complex_thread_local_test.cc",
+ ],
+ deps = [
+ ":complex_thread_local",
+ "//aos/common/logging",
+ "//aos/common/util:thread",
+ "//aos/testing:googletest",
+ ],
)
cc_library(
- name = 'init',
- srcs = [
- 'init.cc',
- ],
- hdrs = [
- 'init.h',
- ],
- deps = [
- '//aos/linux_code/ipc_lib:shared_mem',
- '//aos/common:die',
- '//aos/common/logging:implementations',
- ],
+ name = "init",
+ srcs = [
+ "init.cc",
+ ],
+ hdrs = [
+ "init.h",
+ ],
+ deps = [
+ "//aos/common:die",
+ "//aos/common/logging:implementations",
+ "//aos/linux_code/ipc_lib:shared_mem",
+ ],
)
cc_library(
- name = 'configuration',
- srcs = [
- 'configuration.cc',
- ],
- hdrs = [
- 'configuration.h',
- ],
- deps = [
- '//aos:once',
- '//aos/common/logging',
- '//aos/common:unique_malloc_ptr',
- ],
+ name = "configuration",
+ srcs = [
+ "configuration.cc",
+ ],
+ hdrs = [
+ "configuration.h",
+ ],
+ deps = [
+ "//aos:once",
+ "//aos/common:unique_malloc_ptr",
+ "//aos/common/logging",
+ ],
)
cc_binary(
- name = 'core',
- srcs = [
- 'core.cc',
- ],
- deps = [
- ':init',
- '//aos/common/util:run_command',
- ],
+ name = "core",
+ srcs = [
+ "core.cc",
+ ],
+ deps = [
+ ":init",
+ "//aos/common/util:run_command",
+ ],
)
diff --git a/aos/linux_code/ipc_lib/BUILD b/aos/linux_code/ipc_lib/BUILD
index 8b8686d..d5d2c8d 100644
--- a/aos/linux_code/ipc_lib/BUILD
+++ b/aos/linux_code/ipc_lib/BUILD
@@ -1,150 +1,150 @@
-package(default_visibility = ['//visibility:public'])
+package(default_visibility = ["//visibility:public"])
cc_library(
- name = 'aos_sync',
- srcs = [
- 'aos_sync.cc',
- ],
- hdrs = [
- 'aos_sync.h',
- ],
- linkopts = [
- '-pthread',
- ],
- deps = [
- '//aos/common/logging',
- '//aos:once',
- '//aos/common:macros',
- '//aos/common/util:compiler_memory_barrier',
- ],
+ name = "aos_sync",
+ srcs = [
+ "aos_sync.cc",
+ ],
+ hdrs = [
+ "aos_sync.h",
+ ],
+ linkopts = [
+ "-lpthread",
+ ],
+ deps = [
+ "//aos:once",
+ "//aos/common:macros",
+ "//aos/common/logging",
+ "//aos/common/util:compiler_memory_barrier",
+ ],
)
cc_library(
- name = 'core_lib',
- srcs = [
- 'core_lib.c',
- ],
- hdrs = [
- 'core_lib.h',
- ],
- deps = [
- ':aos_sync',
- ':shared_mem_types',
- ],
+ name = "core_lib",
+ srcs = [
+ "core_lib.c",
+ ],
+ hdrs = [
+ "core_lib.h",
+ ],
+ deps = [
+ ":aos_sync",
+ ":shared_mem_types",
+ ],
)
cc_library(
- name = 'shared_mem',
- srcs = [
- 'shared_mem.c',
- ],
- hdrs = [
- 'shared_mem.h',
- ],
- deps = [
- ':aos_sync',
- ':core_lib',
- ':shared_mem_types',
- '//aos/common/logging',
- ],
- linkopts = [
- '-lrt',
- ],
+ name = "shared_mem",
+ srcs = [
+ "shared_mem.c",
+ ],
+ hdrs = [
+ "shared_mem.h",
+ ],
+ linkopts = [
+ "-lrt",
+ ],
+ deps = [
+ ":aos_sync",
+ ":core_lib",
+ ":shared_mem_types",
+ "//aos/common/logging",
+ ],
)
cc_library(
- # TODO(Brian): This should be shared_mem{,.h}, and the other one should be
- # shared_mem_init{,.cc,.h}.
- name = 'shared_mem_types',
- hdrs = [
- 'shared_mem_types.h',
- ],
- deps = [
- ':aos_sync',
- ],
+ # TODO(Brian): This should be shared_mem{,.h}, and the other one should be
+ # shared_mem_init{,.cc,.h}.
+ name = "shared_mem_types",
+ hdrs = [
+ "shared_mem_types.h",
+ ],
+ deps = [
+ ":aos_sync",
+ ],
)
cc_library(
- name = 'queue',
- srcs = [
- 'queue.cc',
- ],
- hdrs = [
- 'queue.h',
- ],
- deps = [
- '//aos/common:condition',
- '//aos/common:mutex',
- ':core_lib',
- ':shared_mem',
- '//aos/common/logging',
- '//aos/common/util:options',
- ],
- linkopts = [
- '-lrt',
- ],
+ name = "queue",
+ srcs = [
+ "queue.cc",
+ ],
+ hdrs = [
+ "queue.h",
+ ],
+ linkopts = [
+ "-lrt",
+ ],
+ deps = [
+ ":core_lib",
+ ":shared_mem",
+ "//aos/common:condition",
+ "//aos/common:mutex",
+ "//aos/common/logging",
+ "//aos/common/util:options",
+ ],
)
cc_test(
- name = 'raw_queue_test',
- srcs = [
- 'raw_queue_test.cc',
- ],
- deps = [
- '//aos/testing:googletest',
- '//aos/testing:prevent_exit',
- ':queue',
- '//aos/common/logging',
- ':core_lib',
- '//aos/testing:test_shm',
- '//aos/common:time',
- '//aos/common:die',
- '//aos/common/util:thread',
- '//aos/common/util:death_test_log_implementation',
- ],
+ name = "raw_queue_test",
+ srcs = [
+ "raw_queue_test.cc",
+ ],
+ deps = [
+ ":core_lib",
+ ":queue",
+ "//aos/common:die",
+ "//aos/common:time",
+ "//aos/common/logging",
+ "//aos/common/util:death_test_log_implementation",
+ "//aos/common/util:thread",
+ "//aos/testing:googletest",
+ "//aos/testing:prevent_exit",
+ "//aos/testing:test_shm",
+ ],
)
cc_test(
- name = 'ipc_stress_test',
- srcs = [
- 'ipc_stress_test.cc',
- ],
- tags = [
- 'manual',
- ],
- deps = [
- '//aos/testing:googletest',
- '//aos/common:time',
- '//aos/testing:test_shm',
- '//aos/common:mutex',
- ':core_lib',
- '//aos/common:die',
- '//aos/common/libc:dirname',
- '//aos/common/libc:aos_strsignal',
- '//aos/common/logging',
- ],
+ name = "ipc_stress_test",
+ srcs = [
+ "ipc_stress_test.cc",
+ ],
+ tags = [
+ "manual",
+ ],
+ deps = [
+ ":core_lib",
+ "//aos/common:die",
+ "//aos/common:mutex",
+ "//aos/common:time",
+ "//aos/common/libc:aos_strsignal",
+ "//aos/common/libc:dirname",
+ "//aos/common/logging",
+ "//aos/testing:googletest",
+ "//aos/testing:test_shm",
+ ],
)
cc_library(
- name = 'scoped_message_ptr',
- deps = [
- ':queue',
- ],
+ name = "scoped_message_ptr",
+ deps = [
+ ":queue",
+ ],
)
cc_binary(
- name = 'ipc_comparison',
- srcs = [
- 'ipc_comparison.cc',
- ],
- deps = [
- '//aos/common:mutex',
- '//aos/common:event',
- '//aos/common:condition',
- '//third_party/gflags',
- '//aos/common/logging',
- '//aos/common/logging:implementations',
- '//aos/linux_code:init',
- ':queue',
- ],
+ name = "ipc_comparison",
+ srcs = [
+ "ipc_comparison.cc",
+ ],
+ deps = [
+ ":queue",
+ "//aos/common:condition",
+ "//aos/common:event",
+ "//aos/common:mutex",
+ "//aos/common/logging",
+ "//aos/common/logging:implementations",
+ "//aos/linux_code:init",
+ "//third_party/gflags",
+ ],
)