Merge "Do not build LLVM tools on the platform" am: 27f430f6f1 am: d0dd4a8f51

am: b6fd22d4fb

Change-Id: I21eae08e9d1803b73c95b507d6b861170dff57ed

39 files changed, 0 insertions, 1369 deletions

diff --git a/tools/bugpoint-passes/Android.bp b/tools/bugpoint-passes/Android.bp
deleted file mode 100644
index 925c2bd5b609..000000000000
--- a/tools/bugpoint-passes/Android.bp
+++ /dev/null
@@ -1,14 +0,0 @@
-// BugpointPasses module for the host
-// =====================================================
-
-cc_library_host_shared {
-    name: "BugpointPasses",
-    defaults: ["llvm-defaults"],
-    srcs: ["TestPasses.cpp"],
-    allow_undefined_symbols: true,
-    target: {
-        windows: {
-            enabled: false,
-        },
-    },
-}
diff --git a/tools/bugpoint/Android.bp b/tools/bugpoint/Android.bp
deleted file mode 100644
index 89514b868d5e..000000000000
--- a/tools/bugpoint/Android.bp
+++ /dev/null
@@ -1,41 +0,0 @@
-//===---------------------------------------------------------------===
-// bugpoint command line tool
-//===---------------------------------------------------------------===
-
-
-cc_binary_host {
-    name: "bugpoint",
-    defaults: ["llvm-defaults"],
-    srcs: ["*.cpp"],
-    static_libs: [
-        "libLLVMBitWriter",
-        "libLLVMCodeGen",
-        "libLLVMipo",
-        "libLLVMIRReader",
-        "libLLVMBitReader",
-        "libLLVMAsmParser",
-        "libLLVMInstCombine",
-        "libLLVMInstrumentation",
-        "libLLVMLinker",
-        "libLLVMTransformObjCARC",
-        "libLLVMObject",
-        "libLLVMScalarOpts",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMCore",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMProfileData",
-        "libLLVMVectorize",
-        "libLLVMSupport",
-    ],
-    target: {
-        darwin: {
-            ldflags: ["-Wl,-export_dynamic"],
-        },
-        linux: {
-            ldflags: ["-Wl,--export-dynamic"],
-        },
-    },
-}
diff --git a/tools/dsymutil/Android.bp b/tools/dsymutil/Android.bp
deleted file mode 100644
index 731d6c9359a4..000000000000
--- a/tools/dsymutil/Android.bp
+++ /dev/null
@@ -1,53 +0,0 @@
-cc_binary_host {
-    name: "llvm-dsymutil",
-    defaults: ["llvm-defaults"],
-    srcs: ["*.cpp"],
-    static_libs: [
-        "libLLVMARMCodeGen",
-        "libLLVMARMAsmParser",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmParser",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMAsmPrinter",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMProfileData",
-        "libLLVMGlobalISel",
-        "libLLVMDebugInfoDWARF",
-        "libLLVMInstrumentation",
-        "libLLVMMCParser",
-        "libLLVMMCDisassembler",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMScalarOpts",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMCore",
-        "libLLVMMC",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/gold/Android.bp b/tools/gold/Android.bp
deleted file mode 100644
index dd2b134805b7..000000000000
--- a/tools/gold/Android.bp
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// Copyright (C) 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// For the host only
-// =====================================================
-
-/*
-// This module is disabled while switching the name of libLLVM for the target
-// (and host renderscript tools) to libLLVM_android.so.  This tool need not be
-// built in Android build system as we move to the toolchain branch.  Leaving
-// the file here for posterity.
-cc_library_host_shared {
-    name: "LLVMgold",
-    defaults: ["llvm-defaults"],
-    srcs: ["gold-plugin.cpp"],
-    shared_libs: ["libLLVM"],
-    include_dirs: ["toolchain/binutils/binutils-2.27/include"],
-    compile_multilib: "first",
-}
-*/
diff --git a/tools/llc/Android.bp b/tools/llc/Android.bp
deleted file mode 100644
index efe7b9826528..000000000000
--- a/tools/llc/Android.bp
+++ /dev/null
@@ -1,105 +0,0 @@
-//===---------------------------------------------------------------===
-// llc command line tool (common)
-//===---------------------------------------------------------------===
-
-llvm_llc_mips_STATIC_LIBRARIES = [
-    "libLLVMMipsAsmParser",
-    "libLLVMMipsInfo",
-    "libLLVMMipsCodeGen",
-    "libLLVMMipsDesc",
-    "libLLVMMipsAsmPrinter",
-]
-
-llvm_llc_x86_STATIC_LIBRARIES = [
-    "libLLVMX86Info",
-    "libLLVMX86AsmParser",
-    "libLLVMX86CodeGen",
-    "libLLVMX86Disassembler",
-    "libLLVMX86Desc",
-    "libLLVMX86AsmPrinter",
-    "libLLVMX86Utils",
-]
-
-llvm_llc_arm_STATIC_LIBRARIES = [
-    "libLLVMARMCodeGen",
-    "libLLVMARMDisassembler",
-    "libLLVMARMAsmParser",
-    "libLLVMARMAsmPrinter",
-    "libLLVMARMDesc",
-    "libLLVMARMInfo",
-]
-
-llvm_llc_aarch64_STATIC_LIBRARIES = [
-    "libLLVMAArch64Info",
-    "libLLVMAArch64AsmParser",
-    "libLLVMAArch64CodeGen",
-    "libLLVMAArch64Disassembler",
-    "libLLVMAArch64Desc",
-    "libLLVMAArch64AsmPrinter",
-    "libLLVMAArch64Utils",
-]
-
-//===---------------------------------------------------------------===
-// llc command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llc",
-    defaults: ["llvm-defaults"],
-    srcs: ["llc.cpp"],
-    static_libs: [
-        "libLLVMGlobalISel",
-        "libLLVMAsmPrinter",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMIRReader",
-        "libLLVMAsmParser",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMSelectionDAG",
-        "libLLVMInstCombine",
-        "libLLVMCodeGen",
-        "libLLVMProfileData",
-        "libLLVMInstrumentation",
-        "libLLVMObject",
-        "libLLVMipo",
-        "libLLVMLinker",
-        "libLLVMMCDisassembler",
-        "libLLVMMC",
-        "libLLVMMIRParser",
-        "libLLVMMCParser",
-        "libLLVMScalarOpts",
-        "libLLVMTransformUtils",
-        "libLLVMVectorize",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMCore",
-        "libLLVMSupport",
-        "libLLVMObject",
-    ],
-    target: {
-        host: {
-            static_libs: llvm_llc_arm_STATIC_LIBRARIES +
-                llvm_llc_mips_STATIC_LIBRARIES +
-                llvm_llc_x86_STATIC_LIBRARIES +
-                llvm_llc_aarch64_STATIC_LIBRARIES,
-        },
-        android_arm: {
-            static_libs: llvm_llc_arm_STATIC_LIBRARIES,
-        },
-        android_arm64: {
-            static_libs: llvm_llc_aarch64_STATIC_LIBRARIES + llvm_llc_arm_STATIC_LIBRARIES,
-        },
-        android_mips: {
-            static_libs: llvm_llc_mips_STATIC_LIBRARIES,
-        },
-        android_mips64: {
-            static_libs: llvm_llc_mips_STATIC_LIBRARIES,
-        },
-        android_x86: {
-            static_libs: llvm_llc_x86_STATIC_LIBRARIES,
-        },
-        android_x86_64: {
-            static_libs: llvm_llc_x86_STATIC_LIBRARIES,
-        },
-    },
-}
diff --git a/tools/lli/Android.bp b/tools/lli/Android.bp
deleted file mode 100644
index 4ab66bc7956a..000000000000
--- a/tools/lli/Android.bp
+++ /dev/null
@@ -1,69 +0,0 @@
-//===---------------------------------------------------------------===
-// lli command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "lli",
-    defaults: ["llvm-defaults"],
-    srcs: [
-        "lli.cpp",
-        "OrcLazyJIT.cpp",
-    ],
-    static_libs: [
-        "libLLVMIRReader",
-        "libLLVMBitReader",
-        "libLLVMARMCodeGen",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMAsmParser",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86AsmParser",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMAsmPrinter",
-        "libLLVMGlobalISel",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMProfileData",
-        "libLLVMInstrumentation",
-        "libLLVMLinker",
-        "libLLVMInterpreter",
-        "libLLVMScalarOpts",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMMC",
-        "libLLVMMCJIT",
-        "libLLVMOrcJIT",
-        "libLLVMExecutionEngine",
-        "libLLVMRuntimeDyld",
-        "libLLVMMCParser",
-        "libLLVMObject",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMSupport",
-        "libLLVMMCDisassembler",
-    ],
-}
-
-subdirs = ["ChildTarget"]
diff --git a/tools/lli/ChildTarget/Android.bp b/tools/lli/ChildTarget/Android.bp
deleted file mode 100644
index a3f67cc231c2..000000000000
--- a/tools/lli/ChildTarget/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-//===---------------------------------------------------------------===
-// lli-child-target command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "lli-child-target",
-    defaults: ["llvm-defaults"],
-    srcs: ["ChildTarget.cpp"],
-    static_libs: [
-        "libLLVMOrcJIT",
-        "libLLVMRuntimeDyld",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-ar/Android.bp b/tools/llvm-ar/Android.bp
deleted file mode 100644
index d28fa424a156..000000000000
--- a/tools/llvm-ar/Android.bp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-ar command line tool
-//===---------------------------------------------------------------===
-
-/*
-// This module is disabled while switching the name of libLLVM for the target
-// (and host renderscript tools) to libLLVM_android.so.  This tool need not be
-// built in Android build system as we move to the toolchain branch.  Leaving
-// the file here for posterity.
-cc_binary_host {
-    name: "llvm-ar",
-    defaults: ["llvm-defaults"],
-    srcs: ["llvm-ar.cpp"],
-    shared_libs: ["libLLVM"],
-    symlinks: [
-        "llvm-lib",
-        "llvm-ranlib",
-    ],
-}
-*/
diff --git a/tools/llvm-as/Android.bp b/tools/llvm-as/Android.bp
deleted file mode 100644
index f79f39c16239..000000000000
--- a/tools/llvm-as/Android.bp
+++ /dev/null
@@ -1,12 +0,0 @@
-cc_binary_host {
-    name: "llvm-as",
-    defaults: ["llvm-defaults"],
-    srcs: ["llvm-as.cpp"],
-    static_libs: [
-        "libLLVMAsmParser",
-        "libLLVMBitWriter",
-        "libLLVMAnalysis",
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-bcanalyzer/Android.bp b/tools/llvm-bcanalyzer/Android.bp
deleted file mode 100644
index 81f80ea1ecc5..000000000000
--- a/tools/llvm-bcanalyzer/Android.bp
+++ /dev/null
@@ -1,14 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-bcanalyzer command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-bcanalyzer",
-    defaults: ["llvm-defaults"],
-    srcs: ["llvm-bcanalyzer.cpp"],
-    static_libs: [
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-c-test/Android.bp b/tools/llvm-c-test/Android.bp
deleted file mode 100644
index e89bae77358e..000000000000
--- a/tools/llvm-c-test/Android.bp
+++ /dev/null
@@ -1,55 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-c-test command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-c-test",
-    defaults: ["llvm-defaults"],
-    srcs: [
-        "*.c",
-        "*.cpp",
-    ],
-    static_libs: [
-        "libLLVMBitReader",
-        "libLLVMARMCodeGen",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMAsmPrinter",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMGlobalISel",
-        "libLLVMProfileData",
-        "libLLVMInstrumentation",
-        "libLLVMScalarOpts",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMMC",
-        "libLLVMObject",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMSupport",
-        "libLLVMMCDisassembler",
-    ],
-}
diff --git a/tools/llvm-config/Android.bp b/tools/llvm-config/Android.bp
deleted file mode 100644
index bd223cab67c1..000000000000
--- a/tools/llvm-config/Android.bp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-config command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-config",
-    defaults: ["llvm-defaults"],
-    generated_headers: ["llvm-gen-config"],
-    srcs: ["llvm-config.cpp"],
-    static_libs: [
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
-
-// Create BuildVariables.inc dynamically from BuildVariables.inc.in
-genrule {
-    name: "llvm-gen-config",
-    srcs: ["BuildVariables.inc.in"],
-    out: ["BuildVariables.inc"],
-    cmd: "sed -e \"s#@ANDROID_BUILD_TOP@#$$PWD#\" < $(in) > $(out)",
-}
diff --git a/tools/llvm-cov/Android.bp b/tools/llvm-cov/Android.bp
deleted file mode 100644
index fb7e7e7e1dff..000000000000
--- a/tools/llvm-cov/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-cov command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-cov",
-    defaults: ["llvm-defaults"],
-    srcs: ["*.cpp"],
-    static_libs: [
-        "libLLVMObject",
-        "libLLVMProfileDataCoverage",
-        "libLLVMProfileData",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-cxxdump/Android.bp b/tools/llvm-cxxdump/Android.bp
deleted file mode 100644
index ef1aa93d7f77..000000000000
--- a/tools/llvm-cxxdump/Android.bp
+++ /dev/null
@@ -1,46 +0,0 @@
-cc_binary_host {
-    name: "llvm-cxxdump",
-    defaults: ["llvm-defaults"],
-    srcs: [
-        "Error.cpp",
-        "llvm-cxxdump.cpp",
-    ],
-
-    static_libs: [
-        "libLLVMARMAsmParser",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsInfo",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmParser",
-        "libLLVMX86CodeGen",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMAsmPrinter",
-        "libLLVMCodeGen",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMObject",
-        "libLLVMMCParser",
-        "libLLVMMC",
-        "libLLVMMCDisassembler",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-diff/Android.bp b/tools/llvm-diff/Android.bp
deleted file mode 100644
index 91ca31bc4684..000000000000
--- a/tools/llvm-diff/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-diff command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-diff",
-    defaults: ["llvm-defaults"],
-    srcs: [
-        "llvm-diff.cpp",
-        "DiffConsumer.cpp",
-        "DifferenceEngine.cpp",
-        "DiffLog.cpp",
-    ],
-    static_libs: [
-        "libLLVMIRReader",
-        "libLLVMBitReader",
-        "libLLVMAsmParser",
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-dis/Android.bp b/tools/llvm-dis/Android.bp
deleted file mode 100644
index 1b21e5f4518e..000000000000
--- a/tools/llvm-dis/Android.bp
+++ /dev/null
@@ -1,11 +0,0 @@
-cc_binary_host {
-    name: "llvm-dis",
-    defaults: ["llvm-defaults"],
-    srcs: ["llvm-dis.cpp"],
-    static_libs: [
-        "libLLVMAnalysis",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-dwarfdump/Android.bp b/tools/llvm-dwarfdump/Android.bp
deleted file mode 100644
index e3583cd57b90..000000000000
--- a/tools/llvm-dwarfdump/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-dwarfdump command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-dwarfdump",
-    defaults: ["llvm-defaults"],
-    srcs: ["llvm-dwarfdump.cpp"],
-    static_libs: [
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-dwp/Android.bp b/tools/llvm-dwp/Android.bp
deleted file mode 100644
index 3545cee8eb99..000000000000
--- a/tools/llvm-dwp/Android.bp
+++ /dev/null
@@ -1,68 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-dwp command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-dwp",
-    defaults: ["llvm-defaults"],
-
-    srcs: ["*.cpp"],
-
-    static_libs: [
-        "libLLVMDebugInfoDWARF",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMARMCodeGen",
-        "libLLVMARMAsmParser",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMDisassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmParser",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMExecutionEngine",
-        "libLLVMRuntimeDyld",
-        "libLLVMMCJIT",
-        "libLLVMOrcJIT",
-        "libLLVMGlobalISel",
-        "libLLVMAsmPrinter",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMScalarOpts",
-        "libLLVMInstCombine",
-        "libLLVMInstrumentation",
-        "libLLVMTransformObjCARC",
-        "libLLVMTransformUtils",
-        "libLLVMVectorize",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMMCDisassembler",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMLTO",
-        "libLLVMSupport",
-        "libLLVMProfileData",
-    ],
-}
diff --git a/tools/llvm-extract/Android.bp b/tools/llvm-extract/Android.bp
deleted file mode 100644
index 77439491e48c..000000000000
--- a/tools/llvm-extract/Android.bp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-extract command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-extract",
-    defaults: ["llvm-defaults"],
-    srcs: ["llvm-extract.cpp"],
-    static_libs: [
-        "libLLVMIRReader",
-        "libLLVMAsmParser",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMipo",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-link/Android.bp b/tools/llvm-link/Android.bp
deleted file mode 100644
index ec3c5c39f536..000000000000
--- a/tools/llvm-link/Android.bp
+++ /dev/null
@@ -1,25 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-link command line tool
-//===---------------------------------------------------------------===
-
-cc_binary {
-    name: "llvm-link",
-    defaults: ["llvm-defaults"],
-    srcs: ["llvm-link.cpp"],
-    static_libs: [
-        "libLLVMLinker",
-        "libLLVMIRReader",
-        "libLLVMObject",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMAsmParser",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
-
diff --git a/tools/llvm-lto/Android.bp b/tools/llvm-lto/Android.bp
deleted file mode 100644
index dd9d4e86b2ea..000000000000
--- a/tools/llvm-lto/Android.bp
+++ /dev/null
@@ -1,65 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-lto command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-lto",
-    defaults: ["llvm-defaults"],
-    srcs: ["llvm-lto.cpp"],
-    static_libs: [
-        "libLLVMARMCodeGen",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMAsmParser",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86AsmParser",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMAsmPrinter",
-        "libLLVMSelectionDAG",
-        "libLLVMLTO",
-        "libLLVMCodeGen",
-        "libLLVMGlobalISel",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMTarget",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMLinker",
-        "libLLVMipo",
-        "libLLVMIRReader",
-        "libLLVMTransformObjCARC",
-        "libLLVMScalarOpts",
-        "libLLVMInstCombine",
-        "libLLVMVectorize",
-        "libLLVMInstrumentation",
-        "libLLVMTransformUtils",
-        "libLLVMProfileData",
-        "libLLVMAnalysis",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMMCDisassembler",
-        "libLLVMObject",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-mc/Android.bp b/tools/llvm-mc/Android.bp
deleted file mode 100644
index abbdd94d25fb..000000000000
--- a/tools/llvm-mc/Android.bp
+++ /dev/null
@@ -1,50 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-mc command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-mc",
-    defaults: ["llvm-defaults"],
-    srcs: [
-        "llvm-mc.cpp",
-        "Disassembler.cpp",
-    ],
-    static_libs: [
-        "libLLVMARMAsmParser",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsInfo",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmParser",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMAsmPrinter",
-        "libLLVMCodeGen",
-        "libLLVMTransformUtils",
-        "libLLVMTarget",
-        "libLLVMAnalysis",
-        "libLLVMMC",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMSupport",
-        "libLLVMMCDisassembler",
-    ],
-}
diff --git a/tools/llvm-mcmarkup/Android.bp b/tools/llvm-mcmarkup/Android.bp
deleted file mode 100644
index 168bae7c9ccf..000000000000
--- a/tools/llvm-mcmarkup/Android.bp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-mcmarkup command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-mcmarkup",
-    defaults: ["llvm-defaults"],
-    srcs: ["llvm-mcmarkup.cpp"],
-    static_libs: [
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-nm/Android.bp b/tools/llvm-nm/Android.bp
deleted file mode 100644
index d0925302a662..000000000000
--- a/tools/llvm-nm/Android.bp
+++ /dev/null
@@ -1,48 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-nm command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-nm",
-    defaults: ["llvm-defaults"],
-    srcs: ["llvm-nm.cpp"],
-    static_libs: [
-        "libLLVMARMCodeGen",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMAsmParser",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86AsmParser",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMCodeGen",
-        "libLLVMTransformUtils",
-        "libLLVMTarget",
-        "libLLVMAnalysis",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMSupport",
-        "libLLVMMCDisassembler",
-    ],
-}
diff --git a/tools/llvm-objdump/Android.bp b/tools/llvm-objdump/Android.bp
deleted file mode 100644
index 46823d9b037b..000000000000
--- a/tools/llvm-objdump/Android.bp
+++ /dev/null
@@ -1,60 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-objdump command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-objdump",
-    defaults: ["llvm-defaults"],
-    srcs: [
-        "llvm-objdump.cpp",
-        "COFFDump.cpp",
-        "ELFDump.cpp",
-        "MachODump.cpp",
-    ],
-    static_libs: [
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMARMAsmParser",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsInfo",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmParser",
-        "libLLVMX86CodeGen",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMAsmPrinter",
-        "libLLVMCodeGen",
-        "libLLVMTransformUtils",
-        "libLLVMTarget",
-        "libLLVMAnalysis",
-        "libLLVMObject",
-        "libLLVMMCParser",
-        "libLLVMMC",
-        "libLLVMMCDisassembler",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMSupport",
-    ],
-
-    // b/31938382, clang-tidy segmentation fault on MachODump.cpp.
-    tidy_checks: [
-        "-readability-*",
-        "-google-readability-*",
-    ],
-}
diff --git a/tools/llvm-pdbdump/Android.bp b/tools/llvm-pdbdump/Android.bp
deleted file mode 100644
index 2cf9bb5d249c..000000000000
--- a/tools/llvm-pdbdump/Android.bp
+++ /dev/null
@@ -1,10 +0,0 @@
-cc_binary_host {
-    name: "llvm-pdbdump",
-    defaults: ["llvm-defaults"],
-    srcs: ["*.cpp"],
-    static_libs: [
-        "libLLVMDebugInfoPDB",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-profdata/Android.bp b/tools/llvm-profdata/Android.bp
deleted file mode 100644
index 6d4500232874..000000000000
--- a/tools/llvm-profdata/Android.bp
+++ /dev/null
@@ -1,15 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-profdata command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-profdata",
-    defaults: ["llvm-defaults"],
-    srcs: ["llvm-profdata.cpp"],
-    static_libs: [
-        "libLLVMObject",
-        "libLLVMProfileData",
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-readobj/Android.bp b/tools/llvm-readobj/Android.bp
deleted file mode 100644
index e5494caac06b..000000000000
--- a/tools/llvm-readobj/Android.bp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-readobj command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-readobj",
-    defaults: ["llvm-defaults"],
-    srcs: ["*.cpp"],
-    static_libs: [
-        "libLLVMARMInfo",
-        "libLLVMAArch64Info",
-        "libLLVMMipsInfo",
-        "libLLVMX86Info",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-rtdyld/Android.bp b/tools/llvm-rtdyld/Android.bp
deleted file mode 100644
index 08fc9c0b6807..000000000000
--- a/tools/llvm-rtdyld/Android.bp
+++ /dev/null
@@ -1,49 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-rtdyld command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-rtdyld",
-    defaults: ["llvm-defaults"],
-    srcs: ["llvm-rtdyld.cpp"],
-    static_libs: [
-        "libLLVMARMCodeGen",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMAsmParser",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86AsmParser",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMExecutionEngine",
-        "libLLVMCodeGen",
-        "libLLVMObject",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMRuntimeDyld",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMSupport",
-        "libLLVMMCDisassembler",
-    ],
-}
diff --git a/tools/llvm-size/Android.bp b/tools/llvm-size/Android.bp
deleted file mode 100644
index d929ce5e2dde..000000000000
--- a/tools/llvm-size/Android.bp
+++ /dev/null
@@ -1,17 +0,0 @@
-//===---------------------------------------------------------------===
-// llvm-size command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "llvm-size",
-    defaults: ["llvm-defaults"],
-    srcs: ["llvm-size.cpp"],
-    static_libs: [
-        "libLLVMObject",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-split/Android.bp b/tools/llvm-split/Android.bp
deleted file mode 100644
index 8ae519ca5377..000000000000
--- a/tools/llvm-split/Android.bp
+++ /dev/null
@@ -1,15 +0,0 @@
-cc_binary_host {
-    name: "llvm-split",
-    defaults: ["llvm-defaults"],
-    srcs: ["llvm-split.cpp"],
-    static_libs: [
-        "libLLVMIRReader",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/llvm-symbolizer/Android.bp b/tools/llvm-symbolizer/Android.bp
deleted file mode 100644
index e4e4af168a64..000000000000
--- a/tools/llvm-symbolizer/Android.bp
+++ /dev/null
@@ -1,24 +0,0 @@
-cc_binary {
-    name: "llvm-symbolizer",
-    defaults: ["llvm-defaults"],
-    srcs:  ["llvm-symbolizer.cpp"],
-    target: {
-        host: {
-            static_libs: [
-                "libLLVMSymbolize",
-                "libLLVMDebugInfoDWARF",
-                "libLLVMDebugInfoPDB",
-                "libLLVMDebugInfoCodeView",
-                "libLLVMObject",
-                "libLLVMBitReader",
-                "libLLVMMC",
-                "libLLVMMCParser",
-                "libLLVMCore",
-                "libLLVMSupport",
-            ],
-        },
-        android: {
-            shared_libs: ["libLLVM_android"],
-        },
-    },
-}
diff --git a/tools/lto/Android.bp b/tools/lto/Android.bp
deleted file mode 100644
index d9a78fe39108..000000000000
--- a/tools/lto/Android.bp
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (C) 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// For the host only
-// =====================================================
-
-cc_library_host_shared {
-    name: "libLTO",
-    defaults: ["llvm-defaults"],
-    srcs: [
-        "lto.cpp",
-        "LTODisassembler.cpp",
-    ],
-    group_static_libs: true,
-    static_libs: [
-        "libLLVMLinker",
-        "libLLVMipo",
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMIRReader",
-        "libLLVMBitWriter",
-        "libLLVMBitReader",
-        "libLLVMARMCodeGen",
-        "libLLVMARMAsmParser",
-        "libLLVMARMAsmPrinter",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMDisassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmParser",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMExecutionEngine",
-        "libLLVMRuntimeDyld",
-        "libLLVMMCJIT",
-        "libLLVMOrcJIT",
-        "libLLVMGlobalISel",
-        "libLLVMAsmPrinter",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMObject",
-        "libLLVMScalarOpts",
-        "libLLVMInstCombine",
-        "libLLVMInstrumentation",
-        "libLLVMTransformObjCARC",
-        "libLLVMTransformUtils",
-        "libLLVMVectorize",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMMCDisassembler",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMLTO",
-        "libLLVMSupport",
-        "libLLVMProfileData",
-    ],
-}
diff --git a/tools/obj2yaml/Android.bp b/tools/obj2yaml/Android.bp
deleted file mode 100644
index dbd9d6385e18..000000000000
--- a/tools/obj2yaml/Android.bp
+++ /dev/null
@@ -1,18 +0,0 @@
-//===---------------------------------------------------------------===
-// obj2yaml command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "obj2yaml",
-    defaults: ["llvm-defaults"],
-    srcs: ["*.cpp"],
-    static_libs: [
-        "libLLVMObject",
-        "libLLVMObjectYAML",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/opt/Android.bp b/tools/opt/Android.bp
deleted file mode 100644
index 499c4d43f962..000000000000
--- a/tools/opt/Android.bp
+++ /dev/null
@@ -1,69 +0,0 @@
-//===---------------------------------------------------------------===
-// opt command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "opt",
-    defaults: ["llvm-defaults"],
-    srcs: ["*.cpp"],
-    static_libs: [
-        "libLLVMIRReader",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMARMCodeGen",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMGlobalISel",
-        "libLLVMAsmPrinter",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMTransformObjCARC",
-        "libLLVMVectorize",
-        "libLLVMScalarOpts",
-        "libLLVMPasses",
-        "libLLVMipo",
-        "libLLVMLinker",
-        "libLLVMInstCombine",
-        "libLLVMInstrumentation",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMObject",
-        "libLLVMProfileData",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMSupport",
-        "libLLVMMCDisassembler",
-    ],
-    target: {
-        darwin: {
-            ldflags: ["-Wl,-export_dynamic"],
-        },
-        linux: {
-            ldflags: ["-Wl,--export-dynamic"],
-        },
-    },
-}
diff --git a/tools/sancov/Android.bp b/tools/sancov/Android.bp
deleted file mode 100644
index b6c483e6e3d2..000000000000
--- a/tools/sancov/Android.bp
+++ /dev/null
@@ -1,63 +0,0 @@
-//===---------------------------------------------------------------===
-// sancov command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "sancov",
-    defaults: ["llvm-defaults"],
-    srcs: ["sancov.cc"],
-    static_libs: [
-        "libLLVMIRReader",
-        "libLLVMARMCodeGen",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMSymbolize",
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMAsmPrinter",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMTransformObjCARC",
-        "libLLVMVectorize",
-        "libLLVMScalarOpts",
-        "libLLVMPasses",
-        "libLLVMipo",
-        "libLLVMLinker",
-        "libLLVMInstCombine",
-        "libLLVMInstrumentation",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMProfileData",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMSupport",
-        "libLLVMMCDisassembler",
-    ],
-}
diff --git a/tools/sanstats/Android.bp b/tools/sanstats/Android.bp
deleted file mode 100644
index 049447440d77..000000000000
--- a/tools/sanstats/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-//===---------------------------------------------------------------===
-// sanstats command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "sanstats",
-    defaults: ["llvm-defaults"],
-    srcs: ["sanstats.cpp"],
-    static_libs: [
-        "libLLVMSymbolize",
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMMCParser",
-        "libLLVMMC",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/verify-uselistorder/Android.bp b/tools/verify-uselistorder/Android.bp
deleted file mode 100644
index 0aace221cc3b..000000000000
--- a/tools/verify-uselistorder/Android.bp
+++ /dev/null
@@ -1,14 +0,0 @@
-cc_binary_host {
-    name: "verify-uselistorder",
-    defaults: ["llvm-defaults"],
-    srcs: ["verify-uselistorder.cpp"],
-    static_libs: [
-        "libLLVMAsmParser",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMAnalysis",
-        "libLLVMCore",
-        "libLLVMIRReader",
-        "libLLVMSupport",
-    ],
-}
diff --git a/tools/yaml2obj/Android.bp b/tools/yaml2obj/Android.bp
deleted file mode 100644
index d503bc1d77d6..000000000000
--- a/tools/yaml2obj/Android.bp
+++ /dev/null
@@ -1,18 +0,0 @@
-//===---------------------------------------------------------------===
-// yaml2obj command line tool
-//===---------------------------------------------------------------===
-
-cc_binary_host {
-    name: "yaml2obj",
-    defaults: ["llvm-defaults"],
-    srcs: ["*.cpp"],
-    static_libs: [
-        "libLLVMObject",
-        "libLLVMObjectYAML",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMSupport",
-    ],
-}