Bazel: Cleanup libunwind build

PiperOrigin-RevId: 670539217 Change-Id: Ie24608e720948fa02c6ccd21ead97b8c46ed9002
google · Sep 3, 2024 · d40f747 · d40f747
1 parent 5954e8e
commit d40f747
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/sandboxed_api/bazel/external/libunwind.BUILD b/sandboxed_api/bazel/external/libunwind.BUILD
@@ -130,7 +130,11 @@ cc_library(
     hdrs = [
         "include/config.h",
         "include/libunwind.h",
+        "include/libunwind-aarch64.h",
+        "include/libunwind-common.h",
+        "include/libunwind-dynamic.h",
         "include/libunwind-ptrace.h",
+        "include/libunwind-x86_64.h",
     ],
     copts = LIBUNWIND_COPTS + [
         # Assume our inferior doesn't have frame pointers, regardless of
@@ -139,6 +143,7 @@ cc_library(
         "-fno-common",
         "-Wno-cpp",  # Warning in src/ptrace/_UPT_get_dyn_info_list_addr.c
     ],
+    strip_include_prefix = "include",
     visibility = ["//visibility:public"],
     deps = [
         ":included_sources",

diff --git a/sandboxed_api/sandbox2/unwind/BUILD b/sandboxed_api/sandbox2/unwind/BUILD
@@ -36,10 +36,7 @@ cc_library(
     name = "unwind",
     srcs = ["unwind.cc"],
     hdrs = ["unwind.h"],
-    copts = sapi_platform_copts([
-        # TODO(cblichmann): Remove this, fix bazel/external/libunwind.BUILD
-        "-Iexternal/org_gnu_libunwind/include",
-    ]),
+    copts = sapi_platform_copts(),
     visibility = ["//visibility:public"],
     deps = [
         ":ptrace_hook",