From 2e9f50a68f96eb93117d966a35c6461ba18eb77c Mon Sep 17 00:00:00 2001 From: Wiktor Garbacz Date: Wed, 20 Mar 2019 05:19:28 -0700 Subject: [PATCH] Rename deathrattle_fatalmsg proto PiperOrigin-RevId: 239377742 Change-Id: I169407087f5e6f3275e282a51232bb6eea330e49 --- sandboxed_api/sandbox2/BUILD.bazel | 12 ++++++------ sandboxed_api/sandbox2/namespace.h | 2 +- sandboxed_api/sandbox2/policy.h | 2 +- sandboxed_api/sandbox2/regs.h | 2 +- .../{deathrattle_fatalmsg.proto => violation.proto} | 0 5 files changed, 9 insertions(+), 9 deletions(-) rename sandboxed_api/sandbox2/{deathrattle_fatalmsg.proto => violation.proto} (100%) diff --git a/sandboxed_api/sandbox2/BUILD.bazel b/sandboxed_api/sandbox2/BUILD.bazel index 945b06b..daa1bca 100644 --- a/sandboxed_api/sandbox2/BUILD.bazel +++ b/sandboxed_api/sandbox2/BUILD.bazel @@ -34,8 +34,8 @@ cc_library( srcs = ["regs.cc"], hdrs = ["regs.h"], deps = [ - ":deathrattle_fatalmsg_proto_cc", ":syscall", + ":violation_proto_cc", "//sandboxed_api/sandbox2/util:strerror", "//sandboxed_api/util:status", "@com_google_absl//absl/base:core_headers", @@ -167,10 +167,10 @@ cc_library( deps = [ ":bpfdisassembler", ":comms", - ":deathrattle_fatalmsg_proto_cc", ":namespace", ":regs", ":syscall", + ":violation_proto_cc", "//sandboxed_api/sandbox2/util:bpf_helper", "//sandboxed_api/util:flag", "@com_google_absl//absl/base:core_headers", @@ -245,7 +245,7 @@ cc_library( deps = [ ":client", ":comms", - ":deathrattle_fatalmsg_proto_cc", + ":violation_proto_cc", ":forkserver", ":forkserver_proto_cc", ":global_forkserver", @@ -380,10 +380,10 @@ cc_library( srcs = ["namespace.cc"], hdrs = ["namespace.h"], deps = [ - ":deathrattle_fatalmsg_proto_cc", ":mounts", ":mounttree_proto_cc", ":util", + ":violation_proto_cc", "//sandboxed_api/sandbox2/util:file_base", "//sandboxed_api/sandbox2/util:fileops", "//sandboxed_api/sandbox2/util:strerror", @@ -704,8 +704,8 @@ cc_library( ) sapi_proto_library( - name = "deathrattle_fatalmsg_proto", - srcs = ["deathrattle_fatalmsg.proto"], + name = "violation_proto", + srcs = ["violation.proto"], deps = [":mounttree_proto"], ) diff --git a/sandboxed_api/sandbox2/namespace.h b/sandboxed_api/sandbox2/namespace.h index 2848f2a..811d2ba 100644 --- a/sandboxed_api/sandbox2/namespace.h +++ b/sandboxed_api/sandbox2/namespace.h @@ -24,8 +24,8 @@ #include #include "absl/base/macros.h" -#include "sandboxed_api/sandbox2/deathrattle_fatalmsg.pb.h" #include "sandboxed_api/sandbox2/mounts.h" +#include "sandboxed_api/sandbox2/violation.pb.h" namespace sandbox2 { diff --git a/sandboxed_api/sandbox2/policy.h b/sandboxed_api/sandbox2/policy.h index 931ef03..a62833e 100644 --- a/sandboxed_api/sandbox2/policy.h +++ b/sandboxed_api/sandbox2/policy.h @@ -30,9 +30,9 @@ #include "absl/base/macros.h" #include "absl/types/optional.h" -#include "sandboxed_api/sandbox2/deathrattle_fatalmsg.pb.h" #include "sandboxed_api/sandbox2/namespace.h" #include "sandboxed_api/sandbox2/syscall.h" +#include "sandboxed_api/sandbox2/violation.pb.h" #define SANDBOX2_TRACE TRACE(::sandbox2::Syscall::GetHostArch()) diff --git a/sandboxed_api/sandbox2/regs.h b/sandboxed_api/sandbox2/regs.h index c43d302..aeee966 100644 --- a/sandboxed_api/sandbox2/regs.h +++ b/sandboxed_api/sandbox2/regs.h @@ -23,8 +23,8 @@ #include #include -#include "sandboxed_api/sandbox2/deathrattle_fatalmsg.pb.h" #include "sandboxed_api/sandbox2/syscall.h" +#include "sandboxed_api/sandbox2/violation.pb.h" #include "sandboxed_api/util/status.h" namespace sandbox2 { diff --git a/sandboxed_api/sandbox2/deathrattle_fatalmsg.proto b/sandboxed_api/sandbox2/violation.proto similarity index 100% rename from sandboxed_api/sandbox2/deathrattle_fatalmsg.proto rename to sandboxed_api/sandbox2/violation.proto