Merge "Rearrange header libraries"

69 files changed, 5 insertions, 69 deletions

diff --git a/lib/Analysis/Android.bp b/lib/Analysis/Android.bp
index ade72cc787a0..ffccb5a2e96b 100644
--- a/lib/Analysis/Android.bp
+++ b/lib/Analysis/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMAnalysis",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/AsmParser/Android.bp b/lib/AsmParser/Android.bp
index 0742d44c5bf3..3fff6b26b9ae 100644
--- a/lib/AsmParser/Android.bp
+++ b/lib/AsmParser/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMAsmParser",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/Bitcode/Reader/Android.bp b/lib/Bitcode/Reader/Android.bp
index db04eb90813a..da7c543e214c 100644
--- a/lib/Bitcode/Reader/Android.bp
+++ b/lib/Bitcode/Reader/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMBitReader",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/Bitcode/Writer/Android.bp b/lib/Bitcode/Writer/Android.bp
index c9993e385e79..754a252a7d80 100644
--- a/lib/Bitcode/Writer/Android.bp
+++ b/lib/Bitcode/Writer/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMBitWriter",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/CodeGen/Android.bp b/lib/CodeGen/Android.bp
index f5bcbc5d5162..bcd447f6c52c 100644
--- a/lib/CodeGen/Android.bp
+++ b/lib/CodeGen/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMCodeGen",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/CodeGen/AsmPrinter/Android.bp b/lib/CodeGen/AsmPrinter/Android.bp
index 636c4df931ef..d94c00ccdf54 100644
--- a/lib/CodeGen/AsmPrinter/Android.bp
+++ b/lib/CodeGen/AsmPrinter/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMAsmPrinter",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/CodeGen/GlobalISel/Android.bp b/lib/CodeGen/GlobalISel/Android.bp
index c431323d6fe1..871be26c9213 100644
--- a/lib/CodeGen/GlobalISel/Android.bp
+++ b/lib/CodeGen/GlobalISel/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMGlobalISel",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     // Only pull in this one file to ensure we aren't building with this
     // experimental feature just yet.
diff --git a/lib/CodeGen/MIRParser/Android.bp b/lib/CodeGen/MIRParser/Android.bp
index e69667b3ce5b..4c68ec63b316 100644
--- a/lib/CodeGen/MIRParser/Android.bp
+++ b/lib/CodeGen/MIRParser/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMMIRParser",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/CodeGen/SelectionDAG/Android.bp b/lib/CodeGen/SelectionDAG/Android.bp
index e41ddf178070..79c705aad151 100644
--- a/lib/CodeGen/SelectionDAG/Android.bp
+++ b/lib/CodeGen/SelectionDAG/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMSelectionDAG",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/DebugInfo/CodeView/Android.bp b/lib/DebugInfo/CodeView/Android.bp
index 3e0bd6bbb474..6abfae166597 100644
--- a/lib/DebugInfo/CodeView/Android.bp
+++ b/lib/DebugInfo/CodeView/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMDebugInfoCodeView",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/DebugInfo/DWARF/Android.bp b/lib/DebugInfo/DWARF/Android.bp
index bd0e3b555ca0..c198e1f111bb 100644
--- a/lib/DebugInfo/DWARF/Android.bp
+++ b/lib/DebugInfo/DWARF/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMDebugInfoDWARF",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/DebugInfo/PDB/Android.bp b/lib/DebugInfo/PDB/Android.bp
index a1a3d413e13e..f319ded207fc 100644
--- a/lib/DebugInfo/PDB/Android.bp
+++ b/lib/DebugInfo/PDB/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMDebugInfoPDB",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: [
         "*.cpp",
diff --git a/lib/DebugInfo/Symbolize/Android.bp b/lib/DebugInfo/Symbolize/Android.bp
index 23c88aab540d..c859f58a8abe 100644
--- a/lib/DebugInfo/Symbolize/Android.bp
+++ b/lib/DebugInfo/Symbolize/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMSymbolize",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/ExecutionEngine/Android.bp b/lib/ExecutionEngine/Android.bp
index 1845148757c0..41a44925ba89 100644
--- a/lib/ExecutionEngine/Android.bp
+++ b/lib/ExecutionEngine/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMExecutionEngine",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/ExecutionEngine/Interpreter/Android.bp b/lib/ExecutionEngine/Interpreter/Android.bp
index e25233af5250..190a9a86c506 100644
--- a/lib/ExecutionEngine/Interpreter/Android.bp
+++ b/lib/ExecutionEngine/Interpreter/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMInterpreter",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/ExecutionEngine/MCJIT/Android.bp b/lib/ExecutionEngine/MCJIT/Android.bp
index 06136b284c10..6b43bb17d026 100644
--- a/lib/ExecutionEngine/MCJIT/Android.bp
+++ b/lib/ExecutionEngine/MCJIT/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMMCJIT",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/ExecutionEngine/Orc/Android.bp b/lib/ExecutionEngine/Orc/Android.bp
index b5211168a40d..1bb2faeaf80d 100644
--- a/lib/ExecutionEngine/Orc/Android.bp
+++ b/lib/ExecutionEngine/Orc/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMOrcJIT",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/ExecutionEngine/RuntimeDyld/Android.bp b/lib/ExecutionEngine/RuntimeDyld/Android.bp
index 1e14c39122a8..4042beaf1a1f 100644
--- a/lib/ExecutionEngine/RuntimeDyld/Android.bp
+++ b/lib/ExecutionEngine/RuntimeDyld/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMRuntimeDyld",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/IR/Android.bp b/lib/IR/Android.bp
index e10cf5bb259c..9bac320fd62a 100644
--- a/lib/IR/Android.bp
+++ b/lib/IR/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMCore",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     generated_headers: ["llvm-gen-core"],
     srcs: ["*.cpp"],
diff --git a/lib/IRReader/Android.bp b/lib/IRReader/Android.bp
index 7e294ee6e663..a01a80fb828e 100644
--- a/lib/IRReader/Android.bp
+++ b/lib/IRReader/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMIRReader",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/LTO/Android.bp b/lib/LTO/Android.bp
index 1a91c50e4336..928bd5c909bc 100644
--- a/lib/LTO/Android.bp
+++ b/lib/LTO/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMLTO",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/LibDriver/Android.bp b/lib/LibDriver/Android.bp
index 87fdd7cd01e4..d33020bd7d02 100644
--- a/lib/LibDriver/Android.bp
+++ b/lib/LibDriver/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMLibDriver",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     generated_headers: ["llvm-gen-libdriver"],
     srcs: ["*.cpp"],
diff --git a/lib/Linker/Android.bp b/lib/Linker/Android.bp
index f9bf7a1d00a8..a5e1a95359c4 100644
--- a/lib/Linker/Android.bp
+++ b/lib/Linker/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMLinker",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/MC/Android.bp b/lib/MC/Android.bp
index 0750e4625834..05e8445f7f96 100644
--- a/lib/MC/Android.bp
+++ b/lib/MC/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMMC",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/MC/MCDisassembler/Android.bp b/lib/MC/MCDisassembler/Android.bp
index 7d112c9e4165..c2f25fa3d220 100644
--- a/lib/MC/MCDisassembler/Android.bp
+++ b/lib/MC/MCDisassembler/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMMCDisassembler",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/MC/MCParser/Android.bp b/lib/MC/MCParser/Android.bp
index 4331b1df47d2..cc7cd1f01358 100644
--- a/lib/MC/MCParser/Android.bp
+++ b/lib/MC/MCParser/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMMCParser",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/Object/Android.bp b/lib/Object/Android.bp
index 85684d815070..c389476fd628 100644
--- a/lib/Object/Android.bp
+++ b/lib/Object/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMObject",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/ObjectYAML/Android.bp b/lib/ObjectYAML/Android.bp
index b68382a0cf1a..17f4a6796b8e 100644
--- a/lib/ObjectYAML/Android.bp
+++ b/lib/ObjectYAML/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMObjectYAML",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/Option/Android.bp b/lib/Option/Android.bp
index 07dd6b275dbf..035db4d7d483 100644
--- a/lib/Option/Android.bp
+++ b/lib/Option/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMOption",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/Passes/Android.bp b/lib/Passes/Android.bp
index 6c07e2bf797e..f98e1b66c8cd 100644
--- a/lib/Passes/Android.bp
+++ b/lib/Passes/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMPasses",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/ProfileData/Android.bp b/lib/ProfileData/Android.bp
index c5690922f7ee..710d5d406f15 100644
--- a/lib/ProfileData/Android.bp
+++ b/lib/ProfileData/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMProfileData",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/ProfileData/Coverage/Android.bp b/lib/ProfileData/Coverage/Android.bp
index 59621dd9005e..347c500133b9 100644
--- a/lib/ProfileData/Coverage/Android.bp
+++ b/lib/ProfileData/Coverage/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMProfileDataCoverage",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/Support/Android.bp b/lib/Support/Android.bp
index 9805914d7aaa..0d4f93dbd437 100644
--- a/lib/Support/Android.bp
+++ b/lib/Support/Android.bp
@@ -1,12 +1,15 @@
 cc_library_static {
     name: "libLLVMSupport",
-    defaults: ["llvm-lib-defaults"],
+    defaults: ["llvm-defaults-no-generated-headers"],
     target: {
         // llvm-defaults turns off host builds by default, turn it back on for
         // modules that are used to build llvm-tblgen
         host: {
             enabled: true,
         },
+        windows: {
+            enabled: true,
+        },
     },
     srcs: [
         "*.c",
diff --git a/lib/TableGen/Android.bp b/lib/TableGen/Android.bp
index 850baee32aa0..c3310178d698 100644
--- a/lib/TableGen/Android.bp
+++ b/lib/TableGen/Android.bp
@@ -1,6 +1,6 @@
 cc_library_static {
     name: "libLLVMTableGen",
-    defaults: ["llvm-lib-defaults"],
+    defaults: ["llvm-defaults-no-generated-headers"],
     srcs: ["*.cpp"],
     target: {
         // llvm-defaults turns off host builds by default, turn it back on for
diff --git a/lib/Target/AArch64/Android.bp b/lib/Target/AArch64/Android.bp
index 38faf2f4eb94..8de4468a2392 100644
--- a/lib/Target/AArch64/Android.bp
+++ b/lib/Target/AArch64/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMAArch64CodeGen",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/AArch64/AsmParser/Android.bp b/lib/Target/AArch64/AsmParser/Android.bp
index 912ac923b534..9b409aec2c48 100644
--- a/lib/Target/AArch64/AsmParser/Android.bp
+++ b/lib/Target/AArch64/AsmParser/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMAArch64AsmParser",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/AArch64/Disassembler/Android.bp b/lib/Target/AArch64/Disassembler/Android.bp
index 80021b493b32..e7a04d35e32f 100644
--- a/lib/Target/AArch64/Disassembler/Android.bp
+++ b/lib/Target/AArch64/Disassembler/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMAArch64Disassembler",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/AArch64/InstPrinter/Android.bp b/lib/Target/AArch64/InstPrinter/Android.bp
index 7ecd3667d70d..f1dac2a89f98 100644
--- a/lib/Target/AArch64/InstPrinter/Android.bp
+++ b/lib/Target/AArch64/InstPrinter/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMAArch64AsmPrinter",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/AArch64/MCTargetDesc/Android.bp b/lib/Target/AArch64/MCTargetDesc/Android.bp
index 8e8dd27e195c..9edc154a635c 100644
--- a/lib/Target/AArch64/MCTargetDesc/Android.bp
+++ b/lib/Target/AArch64/MCTargetDesc/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMAArch64Desc",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/AArch64/TargetInfo/Android.bp b/lib/Target/AArch64/TargetInfo/Android.bp
index 692ceb75ba1f..baa98cad20fb 100644
--- a/lib/Target/AArch64/TargetInfo/Android.bp
+++ b/lib/Target/AArch64/TargetInfo/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMAArch64Info",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/AArch64/Utils/Android.bp b/lib/Target/AArch64/Utils/Android.bp
index c2d0980d2d9e..aa2db82bb61d 100644
--- a/lib/Target/AArch64/Utils/Android.bp
+++ b/lib/Target/AArch64/Utils/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMAArch64Utils",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/ARM/Android.bp b/lib/Target/ARM/Android.bp
index a169c5541dcb..56e208b51922 100644
--- a/lib/Target/ARM/Android.bp
+++ b/lib/Target/ARM/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMARMCodeGen",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-arm-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/ARM/AsmParser/Android.bp b/lib/Target/ARM/AsmParser/Android.bp
index a370238d709a..3340db5a00f0 100644
--- a/lib/Target/ARM/AsmParser/Android.bp
+++ b/lib/Target/ARM/AsmParser/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMARMAsmParser",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-arm-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/ARM/Disassembler/Android.bp b/lib/Target/ARM/Disassembler/Android.bp
index 306e5083e6dc..8deda869ecb7 100644
--- a/lib/Target/ARM/Disassembler/Android.bp
+++ b/lib/Target/ARM/Disassembler/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMARMDisassembler",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-arm-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/ARM/InstPrinter/Android.bp b/lib/Target/ARM/InstPrinter/Android.bp
index 00151583e64a..f54529f96cf2 100644
--- a/lib/Target/ARM/InstPrinter/Android.bp
+++ b/lib/Target/ARM/InstPrinter/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMARMAsmPrinter",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-arm-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/ARM/MCTargetDesc/Android.bp b/lib/Target/ARM/MCTargetDesc/Android.bp
index 2049fbf41fab..de05686195be 100644
--- a/lib/Target/ARM/MCTargetDesc/Android.bp
+++ b/lib/Target/ARM/MCTargetDesc/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMARMDesc",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-arm-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/ARM/TargetInfo/Android.bp b/lib/Target/ARM/TargetInfo/Android.bp
index 2845ce303f78..cfead24187b9 100644
--- a/lib/Target/ARM/TargetInfo/Android.bp
+++ b/lib/Target/ARM/TargetInfo/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMARMInfo",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-arm-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/Android.bp b/lib/Target/Android.bp
index 4ce8649670e7..5101e66259aa 100644
--- a/lib/Target/Android.bp
+++ b/lib/Target/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMTarget",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/Target/Mips/Android.bp b/lib/Target/Mips/Android.bp
index de9c8a146d58..2ce4f8bda91d 100644
--- a/lib/Target/Mips/Android.bp
+++ b/lib/Target/Mips/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMMipsCodeGen",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-mips-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/Mips/AsmParser/Android.bp b/lib/Target/Mips/AsmParser/Android.bp
index 6ff45ed14d7c..b61dd02d9e0b 100644
--- a/lib/Target/Mips/AsmParser/Android.bp
+++ b/lib/Target/Mips/AsmParser/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMMipsAsmParser",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-mips-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/Mips/Disassembler/Android.bp b/lib/Target/Mips/Disassembler/Android.bp
index 8cc9a282954b..66118be649c8 100644
--- a/lib/Target/Mips/Disassembler/Android.bp
+++ b/lib/Target/Mips/Disassembler/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMMipsDisassembler",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-mips-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/Mips/InstPrinter/Android.bp b/lib/Target/Mips/InstPrinter/Android.bp
index fa3b7356c1d0..28483b68b1c3 100644
--- a/lib/Target/Mips/InstPrinter/Android.bp
+++ b/lib/Target/Mips/InstPrinter/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMMipsAsmPrinter",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-mips-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/Mips/MCTargetDesc/Android.bp b/lib/Target/Mips/MCTargetDesc/Android.bp
index dba9af20a279..cc06b28570b3 100644
--- a/lib/Target/Mips/MCTargetDesc/Android.bp
+++ b/lib/Target/Mips/MCTargetDesc/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMMipsDesc",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-mips-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/Mips/TargetInfo/Android.bp b/lib/Target/Mips/TargetInfo/Android.bp
index e88642870aac..938c076197b8 100644
--- a/lib/Target/Mips/TargetInfo/Android.bp
+++ b/lib/Target/Mips/TargetInfo/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMMipsInfo",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-mips-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/X86/Android.bp b/lib/Target/X86/Android.bp
index 4970c13f12d3..9ca246c7e57f 100644
--- a/lib/Target/X86/Android.bp
+++ b/lib/Target/X86/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMX86CodeGen",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-x86-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/X86/AsmParser/Android.bp b/lib/Target/X86/AsmParser/Android.bp
index 22c459a89e6f..830e02bfd764 100644
--- a/lib/Target/X86/AsmParser/Android.bp
+++ b/lib/Target/X86/AsmParser/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMX86AsmParser",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-x86-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/X86/Disassembler/Android.bp b/lib/Target/X86/Disassembler/Android.bp
index 14753b5ac6ca..0ee2e5ecd3a5 100644
--- a/lib/Target/X86/Disassembler/Android.bp
+++ b/lib/Target/X86/Disassembler/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMX86Disassembler",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-x86-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/X86/InstPrinter/Android.bp b/lib/Target/X86/InstPrinter/Android.bp
index c6b172c99daf..bd37b9e5f787 100644
--- a/lib/Target/X86/InstPrinter/Android.bp
+++ b/lib/Target/X86/InstPrinter/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMX86AsmPrinter",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-x86-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/X86/MCTargetDesc/Android.bp b/lib/Target/X86/MCTargetDesc/Android.bp
index 1fb69d6d428d..7eb5a6e5b8ae 100644
--- a/lib/Target/X86/MCTargetDesc/Android.bp
+++ b/lib/Target/X86/MCTargetDesc/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMX86Desc",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-x86-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/X86/TargetInfo/Android.bp b/lib/Target/X86/TargetInfo/Android.bp
index 0514c8ab1262..a1a2f5c331f1 100644
--- a/lib/Target/X86/TargetInfo/Android.bp
+++ b/lib/Target/X86/TargetInfo/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMX86Info",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-x86-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Target/X86/Utils/Android.bp b/lib/Target/X86/Utils/Android.bp
index 7e20bb682029..30d8ec19c57b 100644
--- a/lib/Target/X86/Utils/Android.bp
+++ b/lib/Target/X86/Utils/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMX86Utils",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
         "llvm-x86-defaults",
     ],
     srcs: ["*.cpp"],
diff --git a/lib/Transforms/Hello/Android.bp b/lib/Transforms/Hello/Android.bp
index 6e8d6672bbe8..64e2e6d35e11 100644
--- a/lib/Transforms/Hello/Android.bp
+++ b/lib/Transforms/Hello/Android.bp
@@ -2,7 +2,6 @@ cc_library_host_shared {
     name: "LLVMHello",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
     allow_undefined_symbols: true,
diff --git a/lib/Transforms/IPO/Android.bp b/lib/Transforms/IPO/Android.bp
index 61bd736f8eb9..644cee12ce2e 100644
--- a/lib/Transforms/IPO/Android.bp
+++ b/lib/Transforms/IPO/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMipo",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/Transforms/InstCombine/Android.bp b/lib/Transforms/InstCombine/Android.bp
index bacfa67b1cda..dfcc7ca139c1 100644
--- a/lib/Transforms/InstCombine/Android.bp
+++ b/lib/Transforms/InstCombine/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMInstCombine",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/Transforms/Instrumentation/Android.bp b/lib/Transforms/Instrumentation/Android.bp
index 17cd297fe006..b719f1758bfe 100644
--- a/lib/Transforms/Instrumentation/Android.bp
+++ b/lib/Transforms/Instrumentation/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMInstrumentation",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/Transforms/ObjCARC/Android.bp b/lib/Transforms/ObjCARC/Android.bp
index 7d4a0189eca6..64bc52982afc 100644
--- a/lib/Transforms/ObjCARC/Android.bp
+++ b/lib/Transforms/ObjCARC/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMTransformObjCARC",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/Transforms/Scalar/Android.bp b/lib/Transforms/Scalar/Android.bp
index 82aceec8eecb..42e1eb880b88 100644
--- a/lib/Transforms/Scalar/Android.bp
+++ b/lib/Transforms/Scalar/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMScalarOpts",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/Transforms/Utils/Android.bp b/lib/Transforms/Utils/Android.bp
index e9c52d194466..8fcf7ef74bb1 100644
--- a/lib/Transforms/Utils/Android.bp
+++ b/lib/Transforms/Utils/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMTransformUtils",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/lib/Transforms/Vectorize/Android.bp b/lib/Transforms/Vectorize/Android.bp
index 432195116968..78b16851a385 100644
--- a/lib/Transforms/Vectorize/Android.bp
+++ b/lib/Transforms/Vectorize/Android.bp
@@ -2,7 +2,6 @@ cc_library_static {
     name: "libLLVMVectorize",
     defaults: [
         "llvm-lib-defaults",
-        "llvm-generated-headers",
     ],
     srcs: ["*.cpp"],
 }