1 files changed, 1 insertions, 14 deletions
diff --git a/llvm/utils/gn/secondary/BUILD.gn b/llvm/utils/gn/secondary/BUILD.gn
index a696e3645d0..b8b748b8a2a 100644
--- a/llvm/utils/gn/secondary/BUILD.gn
+++ b/llvm/utils/gn/secondary/BUILD.gn
@@ -5,24 +5,11 @@ import("//llvm/utils/gn/build/toolchain/compiler.gni")
 group("default") {
   deps = [
     "//clang/test",
+    "//compiler-rt/test/hwasan",
     "//lld/test",
     "//llvm/test",
   ]
 
-  # FIXME: This should be a dependency of a test target instead of being
-  # depended on from here.
-  if (android_ndk_path != "") {
-    android_aarch64_toolchain =
-        "//llvm/utils/gn/build/toolchain:stage2_android_aarch64"
-    deps += [
-      "//compiler-rt/lib/hwasan:hwasan_shared($android_aarch64_toolchain)",
-      "//llvm/tools/llvm-symbolizer($android_aarch64_toolchain)",
-    ]
-  }
-  if (host_cpu == "x64" && host_os == "linux") {
-    deps += [ "//compiler-rt/lib/hwasan:hwasan_shared(//llvm/utils/gn/build/toolchain:stage2_unix)" ]
-  }
-
   testonly = true
 }