From d4da2d9602d41ee76a45cf1ea6ec2070cc3540af Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 1 Dec 2016 14:49:11 -0800 Subject: Convert the rest of llvm to Android.bp A few makefiles still exist in external/llvm/*.mk, they are referenced outside external/llvm but no longer used by anything in external/llvm. Test: m -j checkbuild Change-Id: I8227d8feeac7314c237d2d3379b473dc0ee03ded --- lib/Analysis/Android.bp | 2 +- lib/Android.bp | 10 ++++++++++ lib/AsmParser/Android.bp | 2 +- lib/Bitcode/Reader/Android.bp | 2 +- lib/Bitcode/Writer/Android.bp | 2 +- lib/CodeGen/Android.bp | 2 +- lib/CodeGen/AsmPrinter/Android.bp | 2 +- lib/CodeGen/GlobalISel/Android.bp | 2 +- lib/CodeGen/MIRParser/Android.bp | 2 +- lib/CodeGen/SelectionDAG/Android.bp | 2 +- lib/DebugInfo/CodeView/Android.bp | 2 +- lib/DebugInfo/DWARF/Android.bp | 2 +- lib/DebugInfo/PDB/Android.bp | 2 +- lib/DebugInfo/Symbolize/Android.bp | 2 +- lib/ExecutionEngine/Android.bp | 2 +- lib/ExecutionEngine/Interpreter/Android.bp | 2 +- lib/ExecutionEngine/MCJIT/Android.bp | 2 +- lib/ExecutionEngine/Orc/Android.bp | 2 +- lib/ExecutionEngine/RuntimeDyld/Android.bp | 2 +- lib/IR/Android.bp | 2 +- lib/IRReader/Android.bp | 2 +- lib/LTO/Android.bp | 2 +- lib/LibDriver/Android.bp | 2 +- lib/Linker/Android.bp | 2 +- lib/MC/Android.bp | 2 +- lib/MC/MCDisassembler/Android.bp | 2 +- lib/MC/MCParser/Android.bp | 2 +- lib/Object/Android.bp | 2 +- lib/ObjectYAML/Android.bp | 2 +- lib/Option/Android.bp | 2 +- lib/Passes/Android.bp | 2 +- lib/ProfileData/Android.bp | 2 +- lib/ProfileData/Coverage/Android.bp | 2 +- lib/Support/Android.bp | 2 +- lib/TableGen/Android.bp | 2 +- lib/Target/AArch64/Android.bp | 2 +- lib/Target/AArch64/AsmParser/Android.bp | 2 +- lib/Target/AArch64/Disassembler/Android.bp | 2 +- lib/Target/AArch64/InstPrinter/Android.bp | 2 +- lib/Target/AArch64/MCTargetDesc/Android.bp | 2 +- lib/Target/AArch64/TargetInfo/Android.bp | 2 +- lib/Target/AArch64/Utils/Android.bp | 2 +- lib/Target/ARM/Android.bp | 2 +- lib/Target/ARM/AsmParser/Android.bp | 2 +- lib/Target/ARM/Disassembler/Android.bp | 2 +- lib/Target/ARM/InstPrinter/Android.bp | 2 +- lib/Target/ARM/MCTargetDesc/Android.bp | 2 +- lib/Target/ARM/TargetInfo/Android.bp | 2 +- lib/Target/Android.bp | 2 +- lib/Target/Mips/Android.bp | 2 +- lib/Target/Mips/AsmParser/Android.bp | 2 +- lib/Target/Mips/Disassembler/Android.bp | 2 +- lib/Target/Mips/InstPrinter/Android.bp | 2 +- lib/Target/Mips/MCTargetDesc/Android.bp | 2 +- lib/Target/Mips/TargetInfo/Android.bp | 2 +- lib/Target/X86/Android.bp | 2 +- lib/Target/X86/AsmParser/Android.bp | 2 +- lib/Target/X86/Disassembler/Android.bp | 2 +- lib/Target/X86/InstPrinter/Android.bp | 2 +- lib/Target/X86/MCTargetDesc/Android.bp | 2 +- lib/Target/X86/TargetInfo/Android.bp | 2 +- lib/Target/X86/Utils/Android.bp | 2 +- lib/Transforms/Hello/Android.bp | 2 +- lib/Transforms/IPO/Android.bp | 2 +- lib/Transforms/InstCombine/Android.bp | 2 +- lib/Transforms/Instrumentation/Android.bp | 2 +- lib/Transforms/ObjCARC/Android.bp | 2 +- lib/Transforms/Scalar/Android.bp | 2 +- lib/Transforms/Utils/Android.bp | 2 +- lib/Transforms/Vectorize/Android.bp | 2 +- 70 files changed, 79 insertions(+), 69 deletions(-) (limited to 'lib') diff --git a/lib/Analysis/Android.bp b/lib/Analysis/Android.bp index 0fabe6e802f6..ade72cc787a0 100644 --- a/lib/Analysis/Android.bp +++ b/lib/Analysis/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMAnalysis", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Android.bp b/lib/Android.bp index b44c2960127f..974a44703664 100644 --- a/lib/Android.bp +++ b/lib/Android.bp @@ -1 +1,11 @@ +cc_defaults { + name: "llvm-lib-defaults", + defaults: ["llvm-defaults"], + target: { + windows: { + enabled: true, + }, + }, +} + subdirs = ["*"] diff --git a/lib/AsmParser/Android.bp b/lib/AsmParser/Android.bp index 75106465a2dd..0742d44c5bf3 100644 --- a/lib/AsmParser/Android.bp +++ b/lib/AsmParser/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMAsmParser", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Bitcode/Reader/Android.bp b/lib/Bitcode/Reader/Android.bp index ff9ecadc187e..db04eb90813a 100644 --- a/lib/Bitcode/Reader/Android.bp +++ b/lib/Bitcode/Reader/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMBitReader", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Bitcode/Writer/Android.bp b/lib/Bitcode/Writer/Android.bp index 312e7c2fc785..c9993e385e79 100644 --- a/lib/Bitcode/Writer/Android.bp +++ b/lib/Bitcode/Writer/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMBitWriter", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/CodeGen/Android.bp b/lib/CodeGen/Android.bp index 255dce4a469e..f5bcbc5d5162 100644 --- a/lib/CodeGen/Android.bp +++ b/lib/CodeGen/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMCodeGen", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/CodeGen/AsmPrinter/Android.bp b/lib/CodeGen/AsmPrinter/Android.bp index 388eeab007a2..636c4df931ef 100644 --- a/lib/CodeGen/AsmPrinter/Android.bp +++ b/lib/CodeGen/AsmPrinter/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMAsmPrinter", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/CodeGen/GlobalISel/Android.bp b/lib/CodeGen/GlobalISel/Android.bp index 1663690d4318..c431323d6fe1 100644 --- a/lib/CodeGen/GlobalISel/Android.bp +++ b/lib/CodeGen/GlobalISel/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMGlobalISel", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], // Only pull in this one file to ensure we aren't building with this diff --git a/lib/CodeGen/MIRParser/Android.bp b/lib/CodeGen/MIRParser/Android.bp index 51c8140d9172..e69667b3ce5b 100644 --- a/lib/CodeGen/MIRParser/Android.bp +++ b/lib/CodeGen/MIRParser/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMMIRParser", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/CodeGen/SelectionDAG/Android.bp b/lib/CodeGen/SelectionDAG/Android.bp index 32aec89bbdc5..e41ddf178070 100644 --- a/lib/CodeGen/SelectionDAG/Android.bp +++ b/lib/CodeGen/SelectionDAG/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMSelectionDAG", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/DebugInfo/CodeView/Android.bp b/lib/DebugInfo/CodeView/Android.bp index 19e8e643def6..3e0bd6bbb474 100644 --- a/lib/DebugInfo/CodeView/Android.bp +++ b/lib/DebugInfo/CodeView/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMDebugInfoCodeView", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/DebugInfo/DWARF/Android.bp b/lib/DebugInfo/DWARF/Android.bp index c6d269ffb422..bd0e3b555ca0 100644 --- a/lib/DebugInfo/DWARF/Android.bp +++ b/lib/DebugInfo/DWARF/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMDebugInfoDWARF", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/DebugInfo/PDB/Android.bp b/lib/DebugInfo/PDB/Android.bp index 6f27c204e147..a1a3d413e13e 100644 --- a/lib/DebugInfo/PDB/Android.bp +++ b/lib/DebugInfo/PDB/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMDebugInfoPDB", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: [ diff --git a/lib/DebugInfo/Symbolize/Android.bp b/lib/DebugInfo/Symbolize/Android.bp index bac8a7b69518..23c88aab540d 100644 --- a/lib/DebugInfo/Symbolize/Android.bp +++ b/lib/DebugInfo/Symbolize/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMSymbolize", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/ExecutionEngine/Android.bp b/lib/ExecutionEngine/Android.bp index bf150cec4dd8..1845148757c0 100644 --- a/lib/ExecutionEngine/Android.bp +++ b/lib/ExecutionEngine/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMExecutionEngine", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/ExecutionEngine/Interpreter/Android.bp b/lib/ExecutionEngine/Interpreter/Android.bp index d5682fd07b89..e25233af5250 100644 --- a/lib/ExecutionEngine/Interpreter/Android.bp +++ b/lib/ExecutionEngine/Interpreter/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMInterpreter", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/ExecutionEngine/MCJIT/Android.bp b/lib/ExecutionEngine/MCJIT/Android.bp index cc2a3b7e4e83..06136b284c10 100644 --- a/lib/ExecutionEngine/MCJIT/Android.bp +++ b/lib/ExecutionEngine/MCJIT/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMMCJIT", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/ExecutionEngine/Orc/Android.bp b/lib/ExecutionEngine/Orc/Android.bp index d1c576a8ed74..b5211168a40d 100644 --- a/lib/ExecutionEngine/Orc/Android.bp +++ b/lib/ExecutionEngine/Orc/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMOrcJIT", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/ExecutionEngine/RuntimeDyld/Android.bp b/lib/ExecutionEngine/RuntimeDyld/Android.bp index e2f325cc09e4..1e14c39122a8 100644 --- a/lib/ExecutionEngine/RuntimeDyld/Android.bp +++ b/lib/ExecutionEngine/RuntimeDyld/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMRuntimeDyld", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/IR/Android.bp b/lib/IR/Android.bp index 442d5e0fa8ae..e10cf5bb259c 100644 --- a/lib/IR/Android.bp +++ b/lib/IR/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMCore", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], generated_headers: ["llvm-gen-core"], diff --git a/lib/IRReader/Android.bp b/lib/IRReader/Android.bp index abc4656a5074..7e294ee6e663 100644 --- a/lib/IRReader/Android.bp +++ b/lib/IRReader/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMIRReader", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/LTO/Android.bp b/lib/LTO/Android.bp index 3022d31a38f4..1a91c50e4336 100644 --- a/lib/LTO/Android.bp +++ b/lib/LTO/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMLTO", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/LibDriver/Android.bp b/lib/LibDriver/Android.bp index 6eb5f166be78..87fdd7cd01e4 100644 --- a/lib/LibDriver/Android.bp +++ b/lib/LibDriver/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMLibDriver", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], generated_headers: ["llvm-gen-libdriver"], diff --git a/lib/Linker/Android.bp b/lib/Linker/Android.bp index 0d424b0d2c6e..f9bf7a1d00a8 100644 --- a/lib/Linker/Android.bp +++ b/lib/Linker/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMLinker", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/MC/Android.bp b/lib/MC/Android.bp index 83ae2fd44e06..0750e4625834 100644 --- a/lib/MC/Android.bp +++ b/lib/MC/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMMC", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/MC/MCDisassembler/Android.bp b/lib/MC/MCDisassembler/Android.bp index 183c2cd5a363..7d112c9e4165 100644 --- a/lib/MC/MCDisassembler/Android.bp +++ b/lib/MC/MCDisassembler/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMMCDisassembler", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/MC/MCParser/Android.bp b/lib/MC/MCParser/Android.bp index c688e93847fa..4331b1df47d2 100644 --- a/lib/MC/MCParser/Android.bp +++ b/lib/MC/MCParser/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMMCParser", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Object/Android.bp b/lib/Object/Android.bp index dff2fc62c055..85684d815070 100644 --- a/lib/Object/Android.bp +++ b/lib/Object/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMObject", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/ObjectYAML/Android.bp b/lib/ObjectYAML/Android.bp index 4f53dccd9a93..b68382a0cf1a 100644 --- a/lib/ObjectYAML/Android.bp +++ b/lib/ObjectYAML/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMObjectYAML", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Option/Android.bp b/lib/Option/Android.bp index 704013498b03..07dd6b275dbf 100644 --- a/lib/Option/Android.bp +++ b/lib/Option/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMOption", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Passes/Android.bp b/lib/Passes/Android.bp index ecd2980c906b..6c07e2bf797e 100644 --- a/lib/Passes/Android.bp +++ b/lib/Passes/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMPasses", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/ProfileData/Android.bp b/lib/ProfileData/Android.bp index 557d35599bbe..c5690922f7ee 100644 --- a/lib/ProfileData/Android.bp +++ b/lib/ProfileData/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMProfileData", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/ProfileData/Coverage/Android.bp b/lib/ProfileData/Coverage/Android.bp index b8028142f5e0..59621dd9005e 100644 --- a/lib/ProfileData/Coverage/Android.bp +++ b/lib/ProfileData/Coverage/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMProfileDataCoverage", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Support/Android.bp b/lib/Support/Android.bp index 697fb5c38134..9805914d7aaa 100644 --- a/lib/Support/Android.bp +++ b/lib/Support/Android.bp @@ -1,6 +1,6 @@ cc_library_static { name: "libLLVMSupport", - defaults: ["llvm-defaults"], + defaults: ["llvm-lib-defaults"], target: { // llvm-defaults turns off host builds by default, turn it back on for // modules that are used to build llvm-tblgen diff --git a/lib/TableGen/Android.bp b/lib/TableGen/Android.bp index 497e866ea74a..850baee32aa0 100644 --- a/lib/TableGen/Android.bp +++ b/lib/TableGen/Android.bp @@ -1,6 +1,6 @@ cc_library_static { name: "libLLVMTableGen", - defaults: ["llvm-defaults"], + defaults: ["llvm-lib-defaults"], 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 536c17b562b8..38faf2f4eb94 100644 --- a/lib/Target/AArch64/Android.bp +++ b/lib/Target/AArch64/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMAArch64CodeGen", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-aarch64-defaults", ], diff --git a/lib/Target/AArch64/AsmParser/Android.bp b/lib/Target/AArch64/AsmParser/Android.bp index 7d30fb20e80b..912ac923b534 100644 --- a/lib/Target/AArch64/AsmParser/Android.bp +++ b/lib/Target/AArch64/AsmParser/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMAArch64AsmParser", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-aarch64-defaults", ], diff --git a/lib/Target/AArch64/Disassembler/Android.bp b/lib/Target/AArch64/Disassembler/Android.bp index 9f37921fe12c..80021b493b32 100644 --- a/lib/Target/AArch64/Disassembler/Android.bp +++ b/lib/Target/AArch64/Disassembler/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMAArch64Disassembler", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-aarch64-defaults", ], diff --git a/lib/Target/AArch64/InstPrinter/Android.bp b/lib/Target/AArch64/InstPrinter/Android.bp index 0f8fd4b85aae..7ecd3667d70d 100644 --- a/lib/Target/AArch64/InstPrinter/Android.bp +++ b/lib/Target/AArch64/InstPrinter/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMAArch64AsmPrinter", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-aarch64-defaults", ], diff --git a/lib/Target/AArch64/MCTargetDesc/Android.bp b/lib/Target/AArch64/MCTargetDesc/Android.bp index cd43013be01c..8e8dd27e195c 100644 --- a/lib/Target/AArch64/MCTargetDesc/Android.bp +++ b/lib/Target/AArch64/MCTargetDesc/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMAArch64Desc", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-aarch64-defaults", ], diff --git a/lib/Target/AArch64/TargetInfo/Android.bp b/lib/Target/AArch64/TargetInfo/Android.bp index 75100617a332..692ceb75ba1f 100644 --- a/lib/Target/AArch64/TargetInfo/Android.bp +++ b/lib/Target/AArch64/TargetInfo/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMAArch64Info", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-aarch64-defaults", ], diff --git a/lib/Target/AArch64/Utils/Android.bp b/lib/Target/AArch64/Utils/Android.bp index a1ce501801f2..c2d0980d2d9e 100644 --- a/lib/Target/AArch64/Utils/Android.bp +++ b/lib/Target/AArch64/Utils/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMAArch64Utils", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-aarch64-defaults", ], diff --git a/lib/Target/ARM/Android.bp b/lib/Target/ARM/Android.bp index 0e7ce3925833..a169c5541dcb 100644 --- a/lib/Target/ARM/Android.bp +++ b/lib/Target/ARM/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMARMCodeGen", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-arm-defaults", ], diff --git a/lib/Target/ARM/AsmParser/Android.bp b/lib/Target/ARM/AsmParser/Android.bp index 01614eb483ca..a370238d709a 100644 --- a/lib/Target/ARM/AsmParser/Android.bp +++ b/lib/Target/ARM/AsmParser/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMARMAsmParser", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-arm-defaults", ], diff --git a/lib/Target/ARM/Disassembler/Android.bp b/lib/Target/ARM/Disassembler/Android.bp index 89b98b991e0a..306e5083e6dc 100644 --- a/lib/Target/ARM/Disassembler/Android.bp +++ b/lib/Target/ARM/Disassembler/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMARMDisassembler", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-arm-defaults", ], diff --git a/lib/Target/ARM/InstPrinter/Android.bp b/lib/Target/ARM/InstPrinter/Android.bp index f148f4e49ead..00151583e64a 100644 --- a/lib/Target/ARM/InstPrinter/Android.bp +++ b/lib/Target/ARM/InstPrinter/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMARMAsmPrinter", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-arm-defaults", ], diff --git a/lib/Target/ARM/MCTargetDesc/Android.bp b/lib/Target/ARM/MCTargetDesc/Android.bp index b28f9e263ec4..2049fbf41fab 100644 --- a/lib/Target/ARM/MCTargetDesc/Android.bp +++ b/lib/Target/ARM/MCTargetDesc/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMARMDesc", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-arm-defaults", ], diff --git a/lib/Target/ARM/TargetInfo/Android.bp b/lib/Target/ARM/TargetInfo/Android.bp index efa712e8de30..2845ce303f78 100644 --- a/lib/Target/ARM/TargetInfo/Android.bp +++ b/lib/Target/ARM/TargetInfo/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMARMInfo", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-arm-defaults", ], diff --git a/lib/Target/Android.bp b/lib/Target/Android.bp index 2357cb998809..4ce8649670e7 100644 --- a/lib/Target/Android.bp +++ b/lib/Target/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMTarget", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Target/Mips/Android.bp b/lib/Target/Mips/Android.bp index 9c087c37785c..de9c8a146d58 100644 --- a/lib/Target/Mips/Android.bp +++ b/lib/Target/Mips/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMMipsCodeGen", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-mips-defaults", ], diff --git a/lib/Target/Mips/AsmParser/Android.bp b/lib/Target/Mips/AsmParser/Android.bp index c2164f927e93..6ff45ed14d7c 100644 --- a/lib/Target/Mips/AsmParser/Android.bp +++ b/lib/Target/Mips/AsmParser/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMMipsAsmParser", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-mips-defaults", ], diff --git a/lib/Target/Mips/Disassembler/Android.bp b/lib/Target/Mips/Disassembler/Android.bp index 08d4b3fcd70e..8cc9a282954b 100644 --- a/lib/Target/Mips/Disassembler/Android.bp +++ b/lib/Target/Mips/Disassembler/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMMipsDisassembler", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-mips-defaults", ], diff --git a/lib/Target/Mips/InstPrinter/Android.bp b/lib/Target/Mips/InstPrinter/Android.bp index 70c3648430d3..fa3b7356c1d0 100644 --- a/lib/Target/Mips/InstPrinter/Android.bp +++ b/lib/Target/Mips/InstPrinter/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMMipsAsmPrinter", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-mips-defaults", ], diff --git a/lib/Target/Mips/MCTargetDesc/Android.bp b/lib/Target/Mips/MCTargetDesc/Android.bp index 4d69f6324c5b..dba9af20a279 100644 --- a/lib/Target/Mips/MCTargetDesc/Android.bp +++ b/lib/Target/Mips/MCTargetDesc/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMMipsDesc", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-mips-defaults", ], diff --git a/lib/Target/Mips/TargetInfo/Android.bp b/lib/Target/Mips/TargetInfo/Android.bp index c623a1060109..e88642870aac 100644 --- a/lib/Target/Mips/TargetInfo/Android.bp +++ b/lib/Target/Mips/TargetInfo/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMMipsInfo", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-mips-defaults", ], diff --git a/lib/Target/X86/Android.bp b/lib/Target/X86/Android.bp index 177039adf5fd..4970c13f12d3 100644 --- a/lib/Target/X86/Android.bp +++ b/lib/Target/X86/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMX86CodeGen", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-x86-defaults", ], diff --git a/lib/Target/X86/AsmParser/Android.bp b/lib/Target/X86/AsmParser/Android.bp index 4823fa56f848..22c459a89e6f 100644 --- a/lib/Target/X86/AsmParser/Android.bp +++ b/lib/Target/X86/AsmParser/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMX86AsmParser", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-x86-defaults", ], diff --git a/lib/Target/X86/Disassembler/Android.bp b/lib/Target/X86/Disassembler/Android.bp index 4dd9660f8a01..14753b5ac6ca 100644 --- a/lib/Target/X86/Disassembler/Android.bp +++ b/lib/Target/X86/Disassembler/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMX86Disassembler", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-x86-defaults", ], diff --git a/lib/Target/X86/InstPrinter/Android.bp b/lib/Target/X86/InstPrinter/Android.bp index b07c58e9e0ab..c6b172c99daf 100644 --- a/lib/Target/X86/InstPrinter/Android.bp +++ b/lib/Target/X86/InstPrinter/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMX86AsmPrinter", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-x86-defaults", ], diff --git a/lib/Target/X86/MCTargetDesc/Android.bp b/lib/Target/X86/MCTargetDesc/Android.bp index 65d516e2ccbf..1fb69d6d428d 100644 --- a/lib/Target/X86/MCTargetDesc/Android.bp +++ b/lib/Target/X86/MCTargetDesc/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMX86Desc", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-x86-defaults", ], diff --git a/lib/Target/X86/TargetInfo/Android.bp b/lib/Target/X86/TargetInfo/Android.bp index 83a963b13adc..0514c8ab1262 100644 --- a/lib/Target/X86/TargetInfo/Android.bp +++ b/lib/Target/X86/TargetInfo/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMX86Info", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-x86-defaults", ], diff --git a/lib/Target/X86/Utils/Android.bp b/lib/Target/X86/Utils/Android.bp index e54f12c70d91..7e20bb682029 100644 --- a/lib/Target/X86/Utils/Android.bp +++ b/lib/Target/X86/Utils/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMX86Utils", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", "llvm-x86-defaults", ], diff --git a/lib/Transforms/Hello/Android.bp b/lib/Transforms/Hello/Android.bp index 868edb347828..6e8d6672bbe8 100644 --- a/lib/Transforms/Hello/Android.bp +++ b/lib/Transforms/Hello/Android.bp @@ -1,7 +1,7 @@ cc_library_host_shared { name: "LLVMHello", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Transforms/IPO/Android.bp b/lib/Transforms/IPO/Android.bp index 4189eed66397..61bd736f8eb9 100644 --- a/lib/Transforms/IPO/Android.bp +++ b/lib/Transforms/IPO/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMipo", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Transforms/InstCombine/Android.bp b/lib/Transforms/InstCombine/Android.bp index 02531cf4d231..bacfa67b1cda 100644 --- a/lib/Transforms/InstCombine/Android.bp +++ b/lib/Transforms/InstCombine/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMInstCombine", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Transforms/Instrumentation/Android.bp b/lib/Transforms/Instrumentation/Android.bp index 693937ca1c7f..17cd297fe006 100644 --- a/lib/Transforms/Instrumentation/Android.bp +++ b/lib/Transforms/Instrumentation/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMInstrumentation", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Transforms/ObjCARC/Android.bp b/lib/Transforms/ObjCARC/Android.bp index a37b0483ef99..7d4a0189eca6 100644 --- a/lib/Transforms/ObjCARC/Android.bp +++ b/lib/Transforms/ObjCARC/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMTransformObjCARC", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Transforms/Scalar/Android.bp b/lib/Transforms/Scalar/Android.bp index b479f61615bf..82aceec8eecb 100644 --- a/lib/Transforms/Scalar/Android.bp +++ b/lib/Transforms/Scalar/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMScalarOpts", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Transforms/Utils/Android.bp b/lib/Transforms/Utils/Android.bp index e1f228bf9659..e9c52d194466 100644 --- a/lib/Transforms/Utils/Android.bp +++ b/lib/Transforms/Utils/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMTransformUtils", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], diff --git a/lib/Transforms/Vectorize/Android.bp b/lib/Transforms/Vectorize/Android.bp index 63948269a9e7..432195116968 100644 --- a/lib/Transforms/Vectorize/Android.bp +++ b/lib/Transforms/Vectorize/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libLLVMVectorize", defaults: [ - "llvm-defaults", + "llvm-lib-defaults", "llvm-generated-headers", ], srcs: ["*.cpp"], -- cgit v1.2.3