Rollback of an internal change

PiperOrigin-RevId: 270874732
Change-Id: I69538a0a37ba008a41220fe9d77b3e59f8d06610

sandboxed_api/BUILD.bazel

@@ -142,7 +142,7 @@ cc_library(
     deps = [
         ":call",
         ":lenval_core",
-        ":proto_arg_cc_cc_proto",
+        ":proto_arg_cc",
         ":var_type",
         "//sandboxed_api/sandbox2:comms",
         "//sandboxed_api/util:status",
@@ -169,7 +169,7 @@ cc_library(
     deps = [
         ":call",
         ":lenval_core",
-        ":proto_arg_cc_cc_proto",
+        ":proto_arg_cc",
         ":vars",
         "//sandboxed_api/sandbox2:client",
         "//sandboxed_api/sandbox2:comms",
@@ -190,7 +190,7 @@ cc_test(
     deps = [
         ":sapi",
         "//sandboxed_api/examples/stringop/lib:stringop-sapi",
-        "//sandboxed_api/examples/stringop/lib:stringop_params_cc_proto",
+        "//sandboxed_api/examples/stringop/lib:stringop_params_proto_cc",
         "//sandboxed_api/examples/sum/lib:sum-sapi",
         "//sandboxed_api/examples/sum/lib:sum-sapi_embed",
         "//sandboxed_api/util:status",

sandboxed_api/examples/stringop/BUILD.bazel

@@ -27,7 +27,7 @@ cc_test(
         "//sandboxed_api:sapi",
         "//sandboxed_api:vars",
         "//sandboxed_api/examples/stringop/lib:stringop-sapi",
-        "//sandboxed_api/examples/stringop/lib:stringop_params_proto_cc_cc_proto",
+        "//sandboxed_api/examples/stringop/lib:stringop_params_proto_cc",
         "//sandboxed_api/util:flags",
         "//sandboxed_api/util:status",
         "//sandboxed_api/util:status_matchers",

sandboxed_api/examples/stringop/lib/BUILD.bazel

@@ -30,7 +30,7 @@ cc_library(
     copts = sapi_platform_copts(),
     visibility = ["//visibility:public"],
     deps = [
-        ":stringop_params_proto_cc_cc_proto",
+        ":stringop_params_proto_cc",
         "//sandboxed_api:lenval_core",
     ],
     alwayslink = 1,  # All functions are linked into dependent binaries
@@ -55,5 +55,5 @@ sapi_library(
     lib_name = "Stringop",
     namespace = "",
     visibility = ["//visibility:public"],
-    deps = [":stringop_params_proto_cc_cc_proto"],
+    deps = [":stringop_params_proto_cc"],
 )

sandboxed_api/examples/sum/BUILD.bazel

@@ -25,7 +25,7 @@ cc_binary(
         "//sandboxed_api:sapi",
         "//sandboxed_api:vars",
         "//sandboxed_api/examples/sum/lib:sum-sapi",
-        "//sandboxed_api/examples/sum/lib:sum_params_proto_cc_cc_proto",
+        "//sandboxed_api/examples/sum/lib:sum_params_proto_cc",
         "//sandboxed_api/util:flags",
         "//sandboxed_api/util:status",
         "@com_google_absl//absl/memory",

sandboxed_api/examples/sum/lib/BUILD.bazel

@@ -34,7 +34,7 @@ cc_library(
     copts = sapi_platform_copts(),
     visibility = ["//visibility:public"],
     deps = [
-        ":sum_params_proto_cc_cc_proto",
+        ":sum_params_proto_cc",
         "@com_google_glog//:glog",
     ],
     alwayslink = 1,  # All functions are linked into depending binaries
@@ -68,5 +68,5 @@ sapi_library(
     lib_name = "Sum",
     namespace = "",
     visibility = ["//visibility:public"],
-    deps = [":sum_params_proto_cc_cc_proto"],
+    deps = [":sum_params_proto_cc"],
 )

sandboxed_api/sandbox2/BUILD.bazel

@@ -39,7 +39,7 @@ cc_library(
     copts = sapi_platform_copts(),
     deps = [
         ":syscall",
-        ":violation_proto_cc_cc_proto",
+        ":violation_proto_cc",
         "//sandboxed_api/sandbox2/util:strerror",
         "//sandboxed_api/util:status",
         "@com_google_absl//absl/base:core_headers",
@@ -105,7 +105,7 @@ cc_library(
     copts = sapi_platform_copts(),
     deps = [
         ":comms",
-        ":logserver_proto_cc_cc_proto",
+        ":logserver_proto_cc",
         "@com_google_glog//:glog",
     ],
 )
@@ -118,7 +118,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":comms",
-        ":logserver_proto_cc_cc_proto",
+        ":logserver_proto_cc",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/synchronization",
         "@com_google_glog//:glog",
@@ -183,7 +183,7 @@ cc_library(
         ":namespace",
         ":regs",
         ":syscall",
-        ":violation_proto_cc_cc_proto",
+        ":violation_proto_cc",
         "//sandboxed_api/sandbox2/util:bpf_helper",
         "//sandboxed_api/util:flags",
         "@com_google_absl//absl/base:core_headers",
@@ -259,7 +259,7 @@ cc_library(
     copts = sapi_platform_copts(),
     deps = [
         ":forkserver",
-        ":forkserver_cc_proto",
+        ":forkserver_proto_cc",
         ":global_forkserver",
         ":ipc",
         ":limits",
@@ -304,9 +304,9 @@ cc_library(
         ":client",
         ":executor",
         ":comms",
-        ":violation_proto_cc_cc_proto",
+        ":violation_proto_cc",
         ":forkserver",
-        ":forkserver_proto_cc_cc_proto",
+        ":forkserver_proto_cc",
         ":global_forkserver",
         ":ipc",
         ":limits",
@@ -332,7 +332,7 @@ cc_library(
         "@com_google_absl//absl/types:optional",
         "@org_kernel_libcap//:libcap",
         "//sandboxed_api/sandbox2/unwind",
-        "//sandboxed_api/sandbox2/unwind:unwind_proto_cc_cc_proto",
+        "//sandboxed_api/sandbox2/unwind:unwind_proto_cc",
         "//sandboxed_api/sandbox2/util:bpf_helper",
         "//sandboxed_api/sandbox2/util:file_base",
         "//sandboxed_api/sandbox2/util:fileops",
@@ -383,14 +383,14 @@ cc_library(
     deps = [
         ":client",
         ":comms",
-        ":forkserver_proto_cc_cc_proto",
+        ":forkserver_proto_cc",
         ":namespace",
         ":policy",
         ":syscall",
         ":util",
         "//sandboxed_api/sandbox2/unwind",
         "//sandboxed_api/sandbox2/unwind:ptrace_hook",
-        "//sandboxed_api/sandbox2/unwind:unwind_proto_cc_cc_proto",
+        "//sandboxed_api/sandbox2/unwind:unwind_proto_cc",
         "//sandboxed_api/sandbox2/util:bpf_helper",
         "//sandboxed_api/sandbox2/util:fileops",
         "//sandboxed_api/sandbox2/util:strerror",
@@ -410,7 +410,7 @@ cc_library(
     hdrs = ["mounts.h"],
     copts = sapi_platform_copts(),
     deps = [
-        ":mounttree_proto_cc_cc_proto",
+        ":mounttree_proto_cc",
         "//sandboxed_api/sandbox2/util:file_base",
         "//sandboxed_api/sandbox2/util:fileops",
         "//sandboxed_api/sandbox2/util:minielf",
@@ -449,9 +449,9 @@ cc_library(
     copts = sapi_platform_copts(),
     deps = [
         ":mounts",
-        ":mounttree_proto_cc_cc_proto",
+        ":mounttree_proto_cc",
         ":util",
-        ":violation_proto_cc_cc_proto",
+        ":violation_proto_cc",
         "//sandboxed_api/sandbox2/util:file_base",
         "//sandboxed_api/sandbox2/util:fileops",
         "//sandboxed_api/sandbox2/util:strerror",
@@ -575,8 +575,8 @@ cc_library(
         "//sandboxed_api/sandbox2/util:strerror",
         "//sandboxed_api/util:raw_logging",
         "//sandboxed_api/util:status",
+        "//sandboxed_api/util:status_proto",
         "//sandboxed_api/util:statusor",
-        "//util/task:status_cc_proto",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/strings",
@@ -597,7 +597,7 @@ cc_test(
     copts = sapi_platform_copts(),
     deps = [
         ":comms",
-        ":comms_test_proto_cc_cc_proto",
+        ":comms_test_proto_cc",
         "//sandboxed_api/util:status_matchers",
         "@com_google_absl//absl/container:fixed_array",
         "@com_google_absl//absl/strings",
@@ -618,7 +618,7 @@ cc_test(
     deps = [
         ":comms",
         ":forkserver",
-        ":forkserver_proto_cc_cc_proto",
+        ":forkserver_proto_cc",
         ":sandbox2",
         ":testing",
         "@com_google_absl//absl/strings",

sandboxed_api/sandbox2/unwind/BUILD.bazel

@@ -50,7 +50,7 @@ cc_library(
         ]
     ]),
     deps = [
-        ":unwind_proto_cc_cc_proto",
+        ":unwind_proto_cc",
         "//sandboxed_api/sandbox2:comms",
         "//sandboxed_api/sandbox2/util:maps_parser",
         "//sandboxed_api/sandbox2/util:minielf",

sandboxed_api/util/BUILD.bazel

@@ -41,7 +41,7 @@ cc_library(
     copts = sapi_platform_copts(),
     visibility = ["//visibility:public"],
     deps = [
-        ":status_proto_cc_cc_proto",
+        ":status_proto_cc",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/meta:type_traits",
         "@com_google_absl//absl/strings",