From 27c5db49a0c88dec6a35a97f836a19a70843e2e4 Mon Sep 17 00:00:00 2001
From: James Bartlett <jamesbartlett@pixielabs.ai>
Date: Mon, 13 Feb 2023 18:14:02 +0000
Subject: [PATCH] Fix config=aarch64_sysroot build

Signed-off-by: James Bartlett <jamesbartlett@pixielabs.ai>
---
 .../qemu_with_kernel/exit_qemu_with_status/BUILD.bazel      | 1 +
 src/stirling/BUILD.bazel                                    | 6 ++++--
 .../source_connectors/perf_profiler/java/agent/BUILD.bazel  | 5 +----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bazel/test_runners/qemu_with_kernel/exit_qemu_with_status/BUILD.bazel b/bazel/test_runners/qemu_with_kernel/exit_qemu_with_status/BUILD.bazel
index 823a1c92a1f..6fdd26817e6 100644
--- a/bazel/test_runners/qemu_with_kernel/exit_qemu_with_status/BUILD.bazel
+++ b/bazel/test_runners/qemu_with_kernel/exit_qemu_with_status/BUILD.bazel
@@ -26,4 +26,5 @@ cc_binary(
         "-msan",
     ],
     linkstatic = True,
+    target_compatible_with = ["@platforms//cpu:x86_64"],
 )
diff --git a/src/stirling/BUILD.bazel b/src/stirling/BUILD.bazel
index c11e4207808..aa3c84f9898 100644
--- a/src/stirling/BUILD.bazel
+++ b/src/stirling/BUILD.bazel
@@ -82,8 +82,10 @@ gen_timeconst(name = "stirling_linux_timeconst_files")
 # Used by stirling runtime to provide symbolization for Java application profiling.
 stirling_java_profiling_tools = [
     "//src/stirling/source_connectors/perf_profiler/java/px_jattach:px_jattach",
-    "//src/stirling/source_connectors/perf_profiler/java/agent:agent",
-]
+] + select({
+    "@platforms//cpu:x86_64": ["//src/stirling/source_connectors/perf_profiler/java/agent:agent"],
+    "//conditions:default": [],
+})
 
 # Use this binary to dynamically turn on/off Stirling runtime's debug logging.
 # See src/stirling/e2e_tests/stirling_signal_test.sh for its usage.
diff --git a/src/stirling/source_connectors/perf_profiler/java/agent/BUILD.bazel b/src/stirling/source_connectors/perf_profiler/java/agent/BUILD.bazel
index 60a9f4d7976..bae7da1cd54 100644
--- a/src/stirling/source_connectors/perf_profiler/java/agent/BUILD.bazel
+++ b/src/stirling/source_connectors/perf_profiler/java/agent/BUILD.bazel
@@ -80,10 +80,7 @@ cc_static_musl_binary(
 
 filegroup(
     name = "agent",
-    srcs = select({
-        "@platforms//cpu:aarch64": [],
-        "//conditions:default": ["px-java-agent"],
-    }),
+    srcs = ["px-java-agent"],
     visibility = [
         # Add visibility at top-level so that we can include
         # the lib in the pem image.