From fe1c1b13121125361078f66f496f65fe9227d5c8 Mon Sep 17 00:00:00 2001
From: Artur <arthur_bandaryk@mail.ru>
Date: Mon, 18 Jul 2022 12:57:17 +0300
Subject: [PATCH] Move 'backward' library to
 '3rdparty/bazel-rules-backward-cpp' (#462)

---
 bazel/repos.bzl             | 15 ++++++++++++---
 test/BUILD.bazel            | 21 +--------------------
 test/concurrent/BUILD.bazel |  2 +-
 test/grpc/BUILD.bazel       |  6 +++---
 4 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/bazel/repos.bzl b/bazel/repos.bzl
index 68796553..03f7d8ac 100644
--- a/bazel/repos.bzl
+++ b/bazel/repos.bzl
@@ -1,6 +1,6 @@
 """Adds repositories/archives."""
 
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_repository")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 load("@com_github_3rdparty_stout//bazel:repos.bzl", stout_repos = "repos")
@@ -100,7 +100,16 @@ def repos(repo_mapping = {}):
         git_repository,
         name = "com_github_3rdparty_bazel_rules_backward_cpp",
         remote = "https://github.com/3rdparty/bazel-rules-backward-cpp",
-        commit = "4a63b4ddbd192d3cba994bc79a78540b3924bfbd",
-        shallow_since = "1657266408 +0300",
+        commit = "be06f4fce52e2327d877493d050f42b9d082af3f",
+        shallow_since = "1658132298 +0300",
         repo_mapping = repo_mapping,
     )
+
+    maybe(
+        new_git_repository,
+        name = "com_github_3rdparty_bazel_rules_backward_cpp_stacktrace",
+        remote = "https://github.com/3rdparty/bazel-rules-backward-cpp",
+        build_file = "@com_github_3rdparty_bazel_rules_backward_cpp//:BUILD.backward-stacktrace.bazel",
+        commit = "be06f4fce52e2327d877493d050f42b9d082af3f",
+        shallow_since = "1658132298 +0300",
+    )
diff --git a/test/BUILD.bazel b/test/BUILD.bazel
index cfabcfc6..f1bedc8e 100644
--- a/test/BUILD.bazel
+++ b/test/BUILD.bazel
@@ -38,25 +38,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "backward",
-    srcs = ["backward-stacktrace.cc"],
-    hdrs = ["backward-stacktrace.h"],
-    copts = copts(),
-    # By default this target is visible from current package
-    # (test/BUILD.bazel). We need to make it visible for
-    # 'test/concurrent' and 'test/grpc' packages too.
-    visibility = [
-        "//test/concurrent:__pkg__",
-        "//test/grpc:__pkg__",
-    ],
-    deps = [
-        "@com_github_backward_cpp//:backward",
-        "@com_github_google_googletest//:gtest",
-    ],
-    alwayslink = True,
-)
-
 cc_test(
     name = "eventuals",
     srcs = [
@@ -114,7 +95,7 @@ cc_test(
         # https://github.com/3rdparty/eventuals/issues/450
         "@bazel_tools//src/conditions:windows": [],
         "//conditions:default": [
-            ":backward",
+            "@com_github_3rdparty_bazel_rules_backward_cpp_stacktrace//:backward-stacktrace",
         ],
     }),
 )
diff --git a/test/concurrent/BUILD.bazel b/test/concurrent/BUILD.bazel
index 79b73940..91e95757 100644
--- a/test/concurrent/BUILD.bazel
+++ b/test/concurrent/BUILD.bazel
@@ -46,7 +46,7 @@ cc_library(
         # https://github.com/3rdparty/eventuals/issues/450
         "@bazel_tools//src/conditions:windows": [],
         "//conditions:default": [
-            "//test:backward",
+            "@com_github_3rdparty_bazel_rules_backward_cpp_stacktrace//:backward-stacktrace",
         ],
     }),
     # Setting it to False or leaving it absent will prevent concurrent
diff --git a/test/grpc/BUILD.bazel b/test/grpc/BUILD.bazel
index 8143ef7d..54080337 100644
--- a/test/grpc/BUILD.bazel
+++ b/test/grpc/BUILD.bazel
@@ -22,7 +22,7 @@ cc_binary(
         # https://github.com/3rdparty/eventuals/issues/450
         "@bazel_tools//src/conditions:windows": [],
         "//conditions:default": [
-            "//test:backward",
+            "@com_github_3rdparty_bazel_rules_backward_cpp_stacktrace//:backward-stacktrace",
         ],
     }),
 )
@@ -43,7 +43,7 @@ cc_binary(
         # https://github.com/3rdparty/eventuals/issues/450
         "@bazel_tools//src/conditions:windows": [],
         "//conditions:default": [
-            "//test:backward",
+            "@com_github_3rdparty_bazel_rules_backward_cpp_stacktrace//:backward-stacktrace",
         ],
     }),
 )
@@ -91,9 +91,9 @@ cc_test(
     deps = [
         ":death-constants",
         "//eventuals/grpc",
-        "//test:backward",
         "//test:promisify-for-test",
         "@bazel_tools//tools/cpp/runfiles",
+        "@com_github_3rdparty_bazel_rules_backward_cpp_stacktrace//:backward-stacktrace",
         "@com_github_google_googletest//:gtest",
         "@com_github_grpc_grpc//examples/protos:helloworld_cc_grpc",
         "@com_github_grpc_grpc//examples/protos:keyvaluestore",