diff options
158 files changed, 1485 insertions, 2367 deletions
diff --git a/Android.bp b/Android.bp index e7c7691eca75..0aa8465ff391 100644 --- a/Android.bp +++ b/Android.bp @@ -46,7 +46,6 @@ llvm_defaults { ], }, windows: { - enabled: true, // Disable certain warnings for use with mingw. // We also must undefine WIN32_LEAN_AND_MEAN, since it is being passed globally // on the command line, and LLVM defines this internally itself. @@ -63,6 +62,7 @@ llvm_defaults { // Add on ncurses to have support for terminfo host_ldlibs: [ + "-ldl", "-lncurses", "-lgcc_s", ], @@ -74,7 +74,10 @@ llvm_defaults { ], // Add on ncurses to have support for terminfo - host_ldlibs: ["-lncurses"], + host_ldlibs: [ + "-ldl", + "-lncurses", + ], }, }, } @@ -197,6 +200,7 @@ llvm_cc_shared_library { llvm_x86_static_libraries, }, windows: { + enabled: true, host_ldlibs: [ "-limagehlp", "-lpsapi", @@ -244,6 +248,7 @@ llvm_cc_shared_library { subdirs = [ "soong", - "lib/*", + "lib", + "tools/*", "utils/*", ] diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 317fc08d68a8..000000000000 --- a/Android.mk +++ /dev/null @@ -1,69 +0,0 @@ -LOCAL_PATH := $(call my-dir) -LLVM_ROOT_PATH := $(LOCAL_PATH) - -FORCE_BUILD_LLVM_DISABLE_NDEBUG ?= false -# Legality check: FORCE_BUILD_LLVM_DISABLE_NDEBUG should consist of one word -- either "true" or "false". -ifneq "$(words $(FORCE_BUILD_LLVM_DISABLE_NDEBUG))$(words $(filter-out true false,$(FORCE_BUILD_LLVM_DISABLE_NDEBUG)))" "10" - $(error FORCE_BUILD_LLVM_DISABLE_NDEBUG may only be true, false, or unset) -endif - -FORCE_BUILD_LLVM_DEBUG ?= false -# Legality check: FORCE_BUILD_LLVM_DEBUG should consist of one word -- either "true" or "false". -ifneq "$(words $(FORCE_BUILD_LLVM_DEBUG))$(words $(filter-out true false,$(FORCE_BUILD_LLVM_DEBUG)))" "10" - $(error FORCE_BUILD_LLVM_DEBUG may only be true, false, or unset) -endif - -include $(CLEAR_VARS) - -# LLVM Command Line Tools -subdirs := \ - tools/bugpoint \ - tools/bugpoint-passes \ - tools/dsymutil \ - tools/llc \ - tools/lli \ - tools/lli/ChildTarget \ - tools/llvm-ar \ - tools/llvm-as \ - tools/llvm-bcanalyzer \ - tools/llvm-c-test \ - tools/llvm-config \ - tools/llvm-cov \ - tools/llvm-cxxdump \ - tools/llvm-dis \ - tools/llvm-diff \ - tools/llvm-dwarfdump \ - tools/llvm-dwp \ - tools/llvm-extract \ - tools/llvm-link \ - tools/llvm-lto \ - tools/llvm-mc \ - tools/llvm-mcmarkup \ - tools/llvm-nm \ - tools/llvm-objdump \ - tools/llvm-pdbdump \ - tools/llvm-profdata \ - tools/llvm-readobj \ - tools/llvm-rtdyld \ - tools/llvm-size \ - tools/llvm-split \ - tools/llvm-symbolizer \ - tools/lto \ - tools/gold \ - tools/obj2yaml \ - tools/opt \ - tools/sancov \ - tools/sanstats \ - tools/verify-uselistorder \ - tools/yaml2obj \ - -# LLVM Command Line Utilities -subdirs += \ - utils/count \ - utils/FileCheck \ - utils/not \ - utils/yaml-bench \ - -include $(LOCAL_PATH)/llvm.mk - -include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, $(subdirs))) 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"], diff --git a/tools/bugpoint-passes/Android.bp b/tools/bugpoint-passes/Android.bp new file mode 100644 index 000000000000..be5c405c78c9 --- /dev/null +++ b/tools/bugpoint-passes/Android.bp @@ -0,0 +1,14 @@ +// BugpointPasses module for the host +// ===================================================== + +cc_library_host_shared { + name: "BugpointPasses", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["TestPasses.cpp"], + allow_undefined_symbols: true, + target: { + windows: { + enabled: false, + }, + }, +} diff --git a/tools/bugpoint-passes/Android.mk b/tools/bugpoint-passes/Android.mk deleted file mode 100644 index e78dba4ad0b2..000000000000 --- a/tools/bugpoint-passes/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. -include $(LLVM_ROOT_PATH)/llvm.mk - -bugpoint_passes_SRC_FILES := \ - TestPasses.cpp - -# BugpointPasses module for the host -# ===================================================== -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(bugpoint_passes_SRC_FILES) -LOCAL_MODULE := BugpointPasses - -LOCAL_MODULE_CLASS := SHARED_LIBRARIES # needed for tblgen -LOCAL_ALLOW_UNDEFINED_SYMBOLS := true - -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/tools/bugpoint/Android.bp b/tools/bugpoint/Android.bp new file mode 100644 index 000000000000..fc7fcdd0bead --- /dev/null +++ b/tools/bugpoint/Android.bp @@ -0,0 +1,41 @@ +//===---------------------------------------------------------------=== +// bugpoint command line tool +//===---------------------------------------------------------------=== + + +cc_binary_host { + name: "bugpoint", + defaults: ["llvm-defaults", "llvm-generated-headers"], + 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/bugpoint/Android.mk b/tools/bugpoint/Android.mk deleted file mode 100644 index 040ad49d4411..000000000000 --- a/tools/bugpoint/Android.mk +++ /dev/null @@ -1,62 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# bugpoint command line tool -#===---------------------------------------------------------------=== - -bugpoint_SRC_FILES := \ - BugDriver.cpp \ - CrashDebugger.cpp \ - ExecutionDriver.cpp \ - ExtractFunction.cpp \ - FindBugs.cpp \ - Miscompilation.cpp \ - OptimizerDriver.cpp \ - ToolRunner.cpp \ - bugpoint.cpp \ - -bugpoint_STATIC_LIBRARIES := \ - libLLVMBitWriter \ - libLLVMCodeGen \ - libLLVMipo \ - libLLVMIRReader \ - libLLVMBitReader \ - libLLVMAsmParser \ - libLLVMInstCombine \ - libLLVMInstrumentation \ - libLLVMLinker \ - libLLVMTransformObjCARC \ - libLLVMObject \ - libLLVMScalarOpts \ - libLLVMTransformUtils \ - libLLVMAnalysis \ - libLLVMTarget \ - libLLVMCore \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMProfileData \ - libLLVMVectorize \ - libLLVMSupport \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := bugpoint -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(bugpoint_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(bugpoint_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl -LOCAL_LDFLAGS_darwin := -Wl,-export_dynamic -LOCAL_LDFLAGS_linux := -Wl,--export-dynamic - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/dsymutil/Android.bp b/tools/dsymutil/Android.bp new file mode 100644 index 000000000000..1d96e2efb3fe --- /dev/null +++ b/tools/dsymutil/Android.bp @@ -0,0 +1,53 @@ +cc_binary_host { + name: "llvm-dsymutil", + defaults: ["llvm-defaults", "llvm-generated-headers"], + 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/dsymutil/Android.mk b/tools/dsymutil/Android.mk deleted file mode 100644 index 65e40bd6eeb1..000000000000 --- a/tools/dsymutil/Android.mk +++ /dev/null @@ -1,75 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. -include $(LLVM_ROOT_PATH)/llvm.mk - -llvm_dsymutil_SRC_FILES := \ - BinaryHolder.cpp \ - DebugMap.cpp \ - dsymutil.cpp \ - DwarfLinker.cpp \ - MachODebugMapParser.cpp \ - MachOUtils.cpp \ - -llvm_dsymutil_STATIC_LIBRARIES := \ - 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 \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-dsymutil -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(llvm_dsymutil_SRC_FILES) -LOCAL_LDLIBS += -lpthread -lm -ldl - -LOCAL_STATIC_LIBRARIES := $(llvm_dsymutil_STATIC_LIBRARIES) - -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/gold/Android.bp b/tools/gold/Android.bp new file mode 100644 index 000000000000..5ed206c18a99 --- /dev/null +++ b/tools/gold/Android.bp @@ -0,0 +1,27 @@ +// +// 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: "LLVMgold", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["gold-plugin.cpp"], + shared_libs: ["libLLVM"], + include_dirs: ["toolchain/binutils/binutils-2.25/include"], + compile_multilib: "first", +} diff --git a/tools/gold/Android.mk b/tools/gold/Android.mk deleted file mode 100644 index 976bd620568e..000000000000 --- a/tools/gold/Android.mk +++ /dev/null @@ -1,47 +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. -# - -LOCAL_PATH:= $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../../ -include $(LLVM_ROOT_PATH)/llvm.mk - -# For the host only -# ===================================================== -include $(CLEAR_VARS) -include $(CLEAR_TBLGEN_VARS) - -LOCAL_MODULE := LLVMgold - -LOCAL_MODULE_CLASS := SHARED_LIBRARIES - -llvm_gold_SRC_FILES := \ - gold-plugin.cpp - -LOCAL_SRC_FILES := $(llvm_gold_SRC_FILES) - -LOCAL_SHARED_LIBRARIES := libLLVM - -ifndef USE_MINGW -LOCAL_LDLIBS += -lpthread -ldl -endif - -LOCAL_C_INCLUDES += toolchain/binutils/binutils-2.25/include - -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/tools/llc/Android.bp b/tools/llc/Android.bp new file mode 100644 index 000000000000..55138105278f --- /dev/null +++ b/tools/llc/Android.bp @@ -0,0 +1,105 @@ +//===---------------------------------------------------------------=== +// 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", "llvm-generated-headers"], + 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/llc/Android.mk b/tools/llc/Android.mk deleted file mode 100644 index 1679c86c8c7f..000000000000 --- a/tools/llc/Android.mk +++ /dev/null @@ -1,139 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llc command line tool (common) -#===---------------------------------------------------------------=== - -llvm_llc_SRC_FILES := \ - llc.cpp - -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_STATIC_LIBRARIES := \ - 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 - -llvm_llc_aarch64_STATIC_LIBRARIES := \ - libLLVMAArch64Info \ - libLLVMAArch64AsmParser \ - libLLVMAArch64CodeGen \ - libLLVMAArch64Disassembler \ - libLLVMAArch64Desc \ - libLLVMAArch64AsmPrinter \ - libLLVMAArch64Utils - - - -#===---------------------------------------------------------------=== -# llc command line tool (host) -#===---------------------------------------------------------------=== - -include $(CLEAR_VARS) - -LOCAL_MODULE := llc -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_llc_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := \ - $(llvm_llc_arm_STATIC_LIBRARIES) \ - $(llvm_llc_mips_STATIC_LIBRARIES) \ - $(llvm_llc_x86_STATIC_LIBRARIES) \ - $(llvm_llc_aarch64_STATIC_LIBRARIES) \ - $(llvm_llc_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) - - -#===---------------------------------------------------------------=== -# llc command line tool (target) -#===---------------------------------------------------------------=== - -ifeq (,$(filter $(TARGET_ARCH),$(LLVM_SUPPORTED_ARCH))) -$(warning TODO $(TARGET_ARCH): Enable llc build) -endif - -ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS)) -include $(CLEAR_VARS) - -LOCAL_MODULE := llc -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES - -LOCAL_SRC_FILES := $(llvm_llc_SRC_FILES) -LOCAL_C_INCLUDES += external/llvm/include - -LOCAL_STATIC_LIBRARIES_arm += $(llvm_llc_arm_STATIC_LIBRARIES) -LOCAL_STATIC_LIBRARIES_mips += $(llvm_llc_mips_STATIC_LIBRARIES) -LOCAL_STATIC_LIBRARIES_mips64 += $(llvm_llc_mips_STATIC_LIBRARIES) -LOCAL_STATIC_LIBRARIES_x86 += $(llvm_llc_x86_STATIC_LIBRARIES) -LOCAL_STATIC_LIBRARIES_x86_64 += $(llvm_llc_x86_STATIC_LIBRARIES) -LOCAL_STATIC_LIBRARIES_arm64 += $(llvm_llc_aarch64_STATIC_LIBRARIES) -LOCAL_STATIC_LIBRARIES_arm64 += $(llvm_llc_arm_STATIC_LIBRARIES) - -LOCAL_STATIC_LIBRARIES += $(llvm_llc_STATIC_LIBRARIES) - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_DEVICE_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_EXECUTABLE) -endif diff --git a/tools/lli/Android.bp b/tools/lli/Android.bp new file mode 100644 index 000000000000..f2f24f20c3a4 --- /dev/null +++ b/tools/lli/Android.bp @@ -0,0 +1,69 @@ +//===---------------------------------------------------------------=== +// lli command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "lli", + defaults: ["llvm-defaults", "llvm-generated-headers"], + 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/Android.mk b/tools/lli/Android.mk deleted file mode 100644 index 89a4967ed90c..000000000000 --- a/tools/lli/Android.mk +++ /dev/null @@ -1,86 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# lli command line tool -#===---------------------------------------------------------------=== - -lli_SRC_FILES := \ - lli.cpp \ - OrcLazyJIT.cpp \ - -lli_STATIC_LIBRARIES := \ - 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 \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := lli -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(lli_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(lli_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/lli/ChildTarget/Android.bp b/tools/lli/ChildTarget/Android.bp new file mode 100644 index 000000000000..a76bcdf2a493 --- /dev/null +++ b/tools/lli/ChildTarget/Android.bp @@ -0,0 +1,19 @@ +//===---------------------------------------------------------------=== +// lli-child-target command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "lli-child-target", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["ChildTarget.cpp"], + static_libs: [ + "libLLVMOrcJIT", + "libLLVMRuntimeDyld", + "libLLVMObject", + "libLLVMBitReader", + "libLLVMMC", + "libLLVMMCParser", + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/tools/lli/ChildTarget/Android.mk b/tools/lli/ChildTarget/Android.mk deleted file mode 100644 index bc7dffd5a6a4..000000000000 --- a/tools/lli/ChildTarget/Android.mk +++ /dev/null @@ -1,38 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../../../ - - -#===---------------------------------------------------------------=== -# lli-child-target command line tool -#===---------------------------------------------------------------=== - -lli_child_target_SRC_FILES := \ - ChildTarget.cpp - -include $(CLEAR_VARS) - -LOCAL_MODULE := lli-child-target -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(lli_child_target_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := \ - libLLVMOrcJIT \ - libLLVMRuntimeDyld \ - libLLVMObject \ - libLLVMBitReader \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMCore \ - libLLVMSupport - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-ar/Android.bp b/tools/llvm-ar/Android.bp new file mode 100644 index 000000000000..bc5aad242847 --- /dev/null +++ b/tools/llvm-ar/Android.bp @@ -0,0 +1,14 @@ +//===---------------------------------------------------------------=== +// llvm-ar command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-ar", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["llvm-ar.cpp"], + shared_libs: ["libLLVM"], + symlinks: [ + "llvm-lib", + "llvm-ranlib", + ], +} diff --git a/tools/llvm-ar/Android.mk b/tools/llvm-ar/Android.mk deleted file mode 100644 index e9544ef90829..000000000000 --- a/tools/llvm-ar/Android.mk +++ /dev/null @@ -1,34 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-ar command line tool -#===---------------------------------------------------------------=== - -llvm_ar_SRC_FILES := \ - llvm-ar.cpp - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-ar -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_ar_SRC_FILES) - -LOCAL_SHARED_LIBRARIES := libLLVM - -LOCAL_LDLIBS += -lpthread -lm -ldl - -# Create symlink llvm-lib and llvm-ranlib pointing to llvm-ar. -# Use "=" (instead of ":=") to defer the evaluation. -LOCAL_POST_INSTALL_CMD = $(hide) ln -sf llvm-ar $(dir $(LOCAL_INSTALLED_MODULE))llvm-lib \ - && ln -sf llvm-ar $(dir $(LOCAL_INSTALLED_MODULE))llvm-ranlib - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-as/Android.bp b/tools/llvm-as/Android.bp new file mode 100644 index 000000000000..b3ed31c4ab98 --- /dev/null +++ b/tools/llvm-as/Android.bp @@ -0,0 +1,12 @@ +cc_binary_host { + name: "llvm-as", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["llvm-as.cpp"], + static_libs: [ + "libLLVMAsmParser", + "libLLVMBitWriter", + "libLLVMAnalysis", + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/tools/llvm-as/Android.mk b/tools/llvm-as/Android.mk deleted file mode 100644 index bb3329b65627..000000000000 --- a/tools/llvm-as/Android.mk +++ /dev/null @@ -1,26 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -llvm_as_SRC_FILES := \ - llvm-as.cpp - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-as -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(llvm_as_SRC_FILES) -LOCAL_LDLIBS += -lm -LOCAL_LDLIBS_windows := -limagehlp -lversion -LOCAL_LDLIBS_darwin := -lpthread -ldl -LOCAL_LDLIBS_linux := -lpthread -ldl - -LOCAL_STATIC_LIBRARIES := \ - libLLVMAsmParser \ - libLLVMBitWriter \ - libLLVMAnalysis \ - libLLVMCore \ - libLLVMSupport - -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-bcanalyzer/Android.bp b/tools/llvm-bcanalyzer/Android.bp new file mode 100644 index 000000000000..7fea19359281 --- /dev/null +++ b/tools/llvm-bcanalyzer/Android.bp @@ -0,0 +1,14 @@ +//===---------------------------------------------------------------=== +// llvm-bcanalyzer command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-bcanalyzer", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["llvm-bcanalyzer.cpp"], + static_libs: [ + "libLLVMBitReader", + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/tools/llvm-bcanalyzer/Android.mk b/tools/llvm-bcanalyzer/Android.mk deleted file mode 100644 index f26e733a8397..000000000000 --- a/tools/llvm-bcanalyzer/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-bcanalyzer command line tool -#===---------------------------------------------------------------=== - -llvm_bcanalyzer_SRC_FILES := \ - llvm-bcanalyzer.cpp - -llvm_bcanalyzer_STATIC_LIBRARIES := \ - libLLVMBitReader \ - libLLVMCore \ - libLLVMSupport \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-bcanalyzer -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_bcanalyzer_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_bcanalyzer_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl -LOCAL_C_INCLUDES += external/llvm/include - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-c-test/Android.bp b/tools/llvm-c-test/Android.bp new file mode 100644 index 000000000000..ff0168fd02e5 --- /dev/null +++ b/tools/llvm-c-test/Android.bp @@ -0,0 +1,55 @@ +//===---------------------------------------------------------------=== +// llvm-c-test command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-c-test", + defaults: ["llvm-defaults", "llvm-generated-headers"], + 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-c-test/Android.mk b/tools/llvm-c-test/Android.mk deleted file mode 100644 index 4697f9683e4e..000000000000 --- a/tools/llvm-c-test/Android.mk +++ /dev/null @@ -1,72 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-c-test command line tool -#===---------------------------------------------------------------=== - -llvm_c_test_SRC_FILES := $(sort $(notdir $(wildcard $(LOCAL_PATH)/*.cpp))) -llvm_c_test_SRC_FILES += $(sort $(notdir $(wildcard $(LOCAL_PATH)/*.c))) - -llvm_c_test_STATIC_LIBRARIES := \ - 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 \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-c-test -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_c_test_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_c_test_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-config/Android.bp b/tools/llvm-config/Android.bp new file mode 100644 index 000000000000..2ffec17dadd1 --- /dev/null +++ b/tools/llvm-config/Android.bp @@ -0,0 +1,23 @@ +//===---------------------------------------------------------------=== +// llvm-config command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-config", + defaults: ["llvm-defaults", "llvm-generated-headers"], + 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"], + tool_files: ["BuildVariables.inc.in"], + cmd: "sed -e \"s#@ANDROID_BUILD_TOP@#$$PWD#\" < $(in) > $(out)", +} diff --git a/tools/llvm-config/Android.mk b/tools/llvm-config/Android.mk deleted file mode 100644 index ac97e0bc2195..000000000000 --- a/tools/llvm-config/Android.mk +++ /dev/null @@ -1,49 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - -#===---------------------------------------------------------------=== -# llvm-config command line tool -#===---------------------------------------------------------------=== - -include $(CLEAR_VARS) - -llvm_config_SRC_FILES := \ - llvm-config.cpp - -llvm_config_STATIC_LIBRARIES := \ - libLLVMCore \ - libLLVMSupport - -LOCAL_MODULE := llvm-config -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -# Create BuildVariables.inc dynamically from BuildVariables.inc.in -generated_sources := $(call local-generated-sources-dir) -GEN := $(addprefix $(generated_sources)/, \ - BuildVariables.inc \ - ) - -$(GEN) : PRIVATE_PATH := $(LOCAL_PATH) -$(GEN) : PRIVATE_CUSTOM_TOOL = sed -e 's/@ANDROID_BUILD_TOP@/$(subst /,\/,$(ANDROID_BUILD_TOP))/' < $< > $@ -$(GEN) : $(LOCAL_PATH)/BuildVariables.inc.in -$(GEN): $(generated_sources)/%.inc : $(LOCAL_PATH)/%.inc.in - $(transform-generated-source) - -LOCAL_GENERATED_SOURCES += $(GEN) - -LOCAL_C_INCLUDES := $(generated_sources) - -LOCAL_SRC_FILES := $(llvm_config_SRC_FILES) -LOCAL_STATIC_LIBRARIES := $(llvm_config_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl -LOCAL_ADDITIONAL_DEPENDENCIES := \ - $(LOCAL_PATH)/Android.mk \ - $(LOCAL_GENERATED_SOURCES) - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-cov/Android.bp b/tools/llvm-cov/Android.bp new file mode 100644 index 000000000000..e5567f4de78e --- /dev/null +++ b/tools/llvm-cov/Android.bp @@ -0,0 +1,19 @@ +//===---------------------------------------------------------------=== +// llvm-cov command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-cov", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["*.cpp"], + static_libs: [ + "libLLVMObject", + "libLLVMProfileDataCoverage", + "libLLVMProfileData", + "libLLVMMC", + "libLLVMMCParser", + "libLLVMBitReader", + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/tools/llvm-cov/Android.mk b/tools/llvm-cov/Android.mk deleted file mode 100644 index 62d9f6e9fc4d..000000000000 --- a/tools/llvm-cov/Android.mk +++ /dev/null @@ -1,38 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-cov command line tool -#===---------------------------------------------------------------=== - -llvm_cov_SRC_FILES := $(sort $(notdir $(wildcard $(LOCAL_PATH)/*.cpp))) - -llvm_cov_STATIC_LIBRARIES := \ - libLLVMObject \ - libLLVMProfileDataCoverage \ - libLLVMProfileData \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMBitReader \ - libLLVMCore \ - libLLVMSupport \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-cov -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_cov_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_cov_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-cxxdump/Android.bp b/tools/llvm-cxxdump/Android.bp new file mode 100644 index 000000000000..701e889ef2e9 --- /dev/null +++ b/tools/llvm-cxxdump/Android.bp @@ -0,0 +1,46 @@ +cc_binary_host { + name: "llvm-cxxdump", + defaults: ["llvm-defaults", "llvm-generated-headers"], + 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-cxxdump/Android.mk b/tools/llvm-cxxdump/Android.mk deleted file mode 100644 index b45912cd3a53..000000000000 --- a/tools/llvm-cxxdump/Android.mk +++ /dev/null @@ -1,60 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. -include $(LLVM_ROOT_PATH)/llvm.mk - -llvm_cxxdump_SRC_FILES := \ - Error.cpp \ - llvm-cxxdump.cpp - -llvm_cxxdump_STATIC_LIBRARIES := \ - 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 \ - - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-cxxdump -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(llvm_cxxdump_SRC_FILES) -LOCAL_LDLIBS += -lpthread -lm -ldl - -LOCAL_STATIC_LIBRARIES := $(llvm_cxxdump_STATIC_LIBRARIES) - -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-diff/Android.bp b/tools/llvm-diff/Android.bp new file mode 100644 index 000000000000..ffd4147f9605 --- /dev/null +++ b/tools/llvm-diff/Android.bp @@ -0,0 +1,21 @@ +//===---------------------------------------------------------------=== +// llvm-diff command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-diff", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: [ + "llvm-diff.cpp", + "DiffConsumer.cpp", + "DifferenceEngine.cpp", + "DiffLog.cpp", + ], + static_libs: [ + "libLLVMIRReader", + "libLLVMBitReader", + "libLLVMAsmParser", + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/tools/llvm-diff/Android.mk b/tools/llvm-diff/Android.mk deleted file mode 100644 index a3743d8e5fc6..000000000000 --- a/tools/llvm-diff/Android.mk +++ /dev/null @@ -1,40 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-diff command line tool -#===---------------------------------------------------------------=== - -llvm_diff_SRC_FILES := \ - llvm-diff.cpp \ - DiffConsumer.cpp \ - DifferenceEngine.cpp \ - DiffLog.cpp \ - -llvm_diff_STATIC_LIBRARIES := \ - libLLVMIRReader \ - libLLVMBitReader \ - libLLVMAsmParser \ - libLLVMCore \ - libLLVMSupport \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-diff -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_diff_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_diff_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-dis/Android.bp b/tools/llvm-dis/Android.bp new file mode 100644 index 000000000000..d39713ef1217 --- /dev/null +++ b/tools/llvm-dis/Android.bp @@ -0,0 +1,11 @@ +cc_binary_host { + name: "llvm-dis", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["llvm-dis.cpp"], + static_libs: [ + "libLLVMAnalysis", + "libLLVMBitReader", + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/tools/llvm-dis/Android.mk b/tools/llvm-dis/Android.mk deleted file mode 100644 index bf1fca32442c..000000000000 --- a/tools/llvm-dis/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -llvm_dis_SRC_FILES := \ - llvm-dis.cpp - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-dis -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(llvm_dis_SRC_FILES) -LOCAL_LDLIBS += -lpthread -lm -ldl - -LOCAL_STATIC_LIBRARIES := \ - libLLVMAnalysis \ - libLLVMBitReader \ - libLLVMCore \ - libLLVMSupport - -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-dwarfdump/Android.bp b/tools/llvm-dwarfdump/Android.bp new file mode 100644 index 000000000000..5bba71cfb56f --- /dev/null +++ b/tools/llvm-dwarfdump/Android.bp @@ -0,0 +1,19 @@ +//===---------------------------------------------------------------=== +// llvm-dwarfdump command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-dwarfdump", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["llvm-dwarfdump.cpp"], + static_libs: [ + "libLLVMDebugInfoDWARF", + "libLLVMDebugInfoPDB", + "libLLVMObject", + "libLLVMBitReader", + "libLLVMMC", + "libLLVMMCParser", + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/tools/llvm-dwarfdump/Android.mk b/tools/llvm-dwarfdump/Android.mk deleted file mode 100644 index 225004aa19f7..000000000000 --- a/tools/llvm-dwarfdump/Android.mk +++ /dev/null @@ -1,39 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-dwarfdump command line tool -#===---------------------------------------------------------------=== - -llvm_dwarfdump_SRC_FILES := \ - llvm-dwarfdump.cpp - -llvm_dwarfdump_STATIC_LIBRARIES := \ - libLLVMDebugInfoDWARF \ - libLLVMDebugInfoPDB \ - libLLVMObject \ - libLLVMBitReader \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMCore \ - libLLVMSupport \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-dwarfdump -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_dwarfdump_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_dwarfdump_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-dwp/Android.bp b/tools/llvm-dwp/Android.bp new file mode 100644 index 000000000000..114d4431a631 --- /dev/null +++ b/tools/llvm-dwp/Android.bp @@ -0,0 +1,68 @@ +//===---------------------------------------------------------------=== +// llvm-dwp command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-dwp", + defaults: ["llvm-defaults", "llvm-generated-headers"], + + 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-dwp/Android.mk b/tools/llvm-dwp/Android.mk deleted file mode 100644 index 38b8abe9b765..000000000000 --- a/tools/llvm-dwp/Android.mk +++ /dev/null @@ -1,87 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-dwp command line tool -#===---------------------------------------------------------------=== - -llvm_dwp_SRC_FILES := $(sort $(notdir $(wildcard $(LOCAL_PATH)/*.cpp))) - -llvm_dwp_STATIC_LIBRARIES := \ - 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 \ - libLLVMObject \ - libLLVMScalarOpts \ - libLLVMInstCombine \ - libLLVMInstrumentation \ - libLLVMTransformObjCARC \ - libLLVMTransformUtils \ - libLLVMVectorize \ - libLLVMAnalysis \ - libLLVMTarget \ - libLLVMMCDisassembler \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMCore \ - libLLVMAsmParser \ - libLLVMOption \ - libLLVMLTO \ - libLLVMSupport \ - libLLVMProfileData - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-dwp -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_dwp_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_dwp_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-extract/Android.bp b/tools/llvm-extract/Android.bp new file mode 100644 index 000000000000..2d6f46000a14 --- /dev/null +++ b/tools/llvm-extract/Android.bp @@ -0,0 +1,22 @@ +//===---------------------------------------------------------------=== +// llvm-extract command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-extract", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["llvm-extract.cpp"], + static_libs: [ + "libLLVMIRReader", + "libLLVMAsmParser", + "libLLVMObject", + "libLLVMBitReader", + "libLLVMBitWriter", + "libLLVMipo", + "libLLVMTransformUtils", + "libLLVMAnalysis", + "libLLVMTarget", + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/tools/llvm-extract/Android.mk b/tools/llvm-extract/Android.mk deleted file mode 100644 index 809f4b202488..000000000000 --- a/tools/llvm-extract/Android.mk +++ /dev/null @@ -1,43 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-extract command line tool -#===---------------------------------------------------------------=== - -llvm_extract_SRC_FILES := \ - llvm-extract.cpp - -llvm_extract_STATIC_LIBRARIES := \ - libLLVMIRReader \ - libLLVMAsmParser \ - libLLVMObject \ - libLLVMBitReader \ - libLLVMBitWriter \ - libLLVMipo \ - libLLVMTransformUtils \ - libLLVMAnalysis \ - libLLVMTarget \ - libLLVMCore \ - libLLVMSupport \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-extract -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_extract_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_extract_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-link/Android.bp b/tools/llvm-link/Android.bp new file mode 100644 index 000000000000..0c2073844e70 --- /dev/null +++ b/tools/llvm-link/Android.bp @@ -0,0 +1,25 @@ +//===---------------------------------------------------------------=== +// llvm-link command line tool +//===---------------------------------------------------------------=== + +cc_binary { + name: "llvm-link", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["llvm-link.cpp"], + static_libs: [ + "libLLVMLinker", + "libLLVMIRReader", + "libLLVMObject", + "libLLVMMC", + "libLLVMMCParser", + "libLLVMBitReader", + "libLLVMBitWriter", + "libLLVMAsmParser", + "libLLVMTransformUtils", + "libLLVMAnalysis", + "libLLVMTarget", + "libLLVMCore", + "libLLVMSupport", + ], +} + diff --git a/tools/llvm-link/Android.mk b/tools/llvm-link/Android.mk deleted file mode 100644 index a77f7d0eec55..000000000000 --- a/tools/llvm-link/Android.mk +++ /dev/null @@ -1,54 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -llvm_link_SRC_FILES := \ - llvm-link.cpp - -llvm_link_STATIC_LIBRARIES := \ - libLLVMLinker \ - libLLVMIRReader \ - libLLVMObject \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMBitReader \ - libLLVMBitWriter \ - libLLVMAsmParser \ - libLLVMTransformUtils \ - libLLVMAnalysis \ - libLLVMTarget \ - libLLVMCore \ - libLLVMSupport - -#===---------------------------------------------------------------=== -# llvm-link command line tool (host) -#===---------------------------------------------------------------=== - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-link -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_SRC_FILES := $(llvm_link_SRC_FILES) -LOCAL_STATIC_LIBRARIES := $(llvm_link_STATIC_LIBRARIES) -LOCAL_LDLIBS += -lpthread - -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(BUILD_HOST_EXECUTABLE) - -#===---------------------------------------------------------------=== -# llvm-link command line tool (target) -#===---------------------------------------------------------------=== - -ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS)) -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-link -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_SRC_FILES := $(llvm_link_SRC_FILES) -LOCAL_STATIC_LIBRARIES := $(llvm_link_STATIC_LIBRARIES) - -include $(LLVM_DEVICE_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(BUILD_EXECUTABLE) -endif diff --git a/tools/llvm-lto/Android.bp b/tools/llvm-lto/Android.bp new file mode 100644 index 000000000000..7e921af31870 --- /dev/null +++ b/tools/llvm-lto/Android.bp @@ -0,0 +1,65 @@ +//===---------------------------------------------------------------=== +// llvm-lto command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-lto", + defaults: ["llvm-defaults", "llvm-generated-headers"], + 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-lto/Android.mk b/tools/llvm-lto/Android.mk deleted file mode 100644 index bd280abe1621..000000000000 --- a/tools/llvm-lto/Android.mk +++ /dev/null @@ -1,86 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-lto command line tool -#===---------------------------------------------------------------=== - -llvm_lto_SRC_FILES := \ - llvm-lto.cpp - -llvm_lto_STATIC_LIBRARIES := \ - 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 \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-lto -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_lto_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_lto_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-mc/Android.bp b/tools/llvm-mc/Android.bp new file mode 100644 index 000000000000..ab87ae1f97e1 --- /dev/null +++ b/tools/llvm-mc/Android.bp @@ -0,0 +1,50 @@ +//===---------------------------------------------------------------=== +// llvm-mc command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-mc", + defaults: ["llvm-defaults", "llvm-generated-headers"], + 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-mc/Android.mk b/tools/llvm-mc/Android.mk deleted file mode 100644 index e7e29ee5fc25..000000000000 --- a/tools/llvm-mc/Android.mk +++ /dev/null @@ -1,68 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-mc command line tool -#===---------------------------------------------------------------=== - -llvm_mc_SRC_FILES := \ - llvm-mc.cpp \ - Disassembler.cpp - -llvm_mc_STATIC_LIBRARIES := \ - 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 \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-mc -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_mc_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_mc_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-mcmarkup/Android.bp b/tools/llvm-mcmarkup/Android.bp new file mode 100644 index 000000000000..ed27d6dec012 --- /dev/null +++ b/tools/llvm-mcmarkup/Android.bp @@ -0,0 +1,13 @@ +//===---------------------------------------------------------------=== +// llvm-mcmarkup command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-mcmarkup", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["llvm-mcmarkup.cpp"], + static_libs: [ + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/tools/llvm-mcmarkup/Android.mk b/tools/llvm-mcmarkup/Android.mk deleted file mode 100644 index 92529eac605c..000000000000 --- a/tools/llvm-mcmarkup/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-mcmarkup command line tool -#===---------------------------------------------------------------=== - -llvm_mcmarkup_SRC_FILES := \ - llvm-mcmarkup.cpp - -llvm_mcmarkup_STATIC_LIBRARIES := \ - libLLVMCore \ - libLLVMSupport \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-mcmarkup -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_mcmarkup_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_mcmarkup_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-nm/Android.bp b/tools/llvm-nm/Android.bp new file mode 100644 index 000000000000..da42e2e2b013 --- /dev/null +++ b/tools/llvm-nm/Android.bp @@ -0,0 +1,50 @@ +//===---------------------------------------------------------------=== +// llvm-nm command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-nm", + defaults: ["llvm-defaults", "llvm-generated-headers"], + 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", + ], + // b/31938645, clang-tidy segmentation fault on llvm-nm.cpp. + tidy_checks: ["-llvm-twine-local"], +} diff --git a/tools/llvm-nm/Android.mk b/tools/llvm-nm/Android.mk deleted file mode 100644 index 93c6d8c94acf..000000000000 --- a/tools/llvm-nm/Android.mk +++ /dev/null @@ -1,72 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-nm command line tool -#===---------------------------------------------------------------=== - -llvm_nm_SRC_FILES := \ - llvm-nm.cpp - -llvm_nm_STATIC_LIBRARIES := \ - 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 \ - -include $(CLEAR_VARS) - -# b/31938645, clang-tidy segmentation fault on llvm-nm.cpp. -LOCAL_TIDY_CHECKS := -llvm-twine-local - -LOCAL_MODULE := llvm-nm -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_nm_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_nm_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-objdump/Android.bp b/tools/llvm-objdump/Android.bp new file mode 100644 index 000000000000..d691e4e753b9 --- /dev/null +++ b/tools/llvm-objdump/Android.bp @@ -0,0 +1,57 @@ +//===---------------------------------------------------------------=== +// llvm-objdump command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-objdump", + defaults: ["llvm-defaults", "llvm-generated-headers"], + 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-objdump/Android.mk b/tools/llvm-objdump/Android.mk deleted file mode 100644 index 3691ca03b35f..000000000000 --- a/tools/llvm-objdump/Android.mk +++ /dev/null @@ -1,75 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-objdump command line tool -#===---------------------------------------------------------------=== - -llvm_objdump_SRC_FILES := \ - llvm-objdump.cpp \ - COFFDump.cpp \ - ELFDump.cpp \ - MachODump.cpp \ - -llvm_objdump_STATIC_LIBRARIES := \ - 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 \ - -include $(CLEAR_VARS) - -# b/31938382, clang-tidy segmentation fault on MachODump.cpp. -LOCAL_TIDY_CHECKS := -readability-*,-google-readability-* - -LOCAL_MODULE := llvm-objdump -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_objdump_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_objdump_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-pdbdump/Android.bp b/tools/llvm-pdbdump/Android.bp new file mode 100644 index 000000000000..0dd27b456309 --- /dev/null +++ b/tools/llvm-pdbdump/Android.bp @@ -0,0 +1,10 @@ +cc_binary_host { + name: "llvm-pdbdump", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["*.cpp"], + static_libs: [ + "libLLVMDebugInfoPDB", + "libLLVMDebugInfoCodeView", + "libLLVMSupport", + ], +} diff --git a/tools/llvm-pdbdump/Android.mk b/tools/llvm-pdbdump/Android.mk deleted file mode 100644 index b37685f047b8..000000000000 --- a/tools/llvm-pdbdump/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. -include $(LLVM_ROOT_PATH)/llvm.mk - -llvm_pdbdump_SRC_FILES := $(sort $(notdir $(wildcard $(LOCAL_PATH)/*.cpp))) - -llvm_pdbdump_STATIC_LIBRARIES := \ - libLLVMDebugInfoPDB \ - libLLVMDebugInfoCodeView \ - libLLVMSupport - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-pdbdump -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_pdbdump_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_pdbdump_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-profdata/Android.bp b/tools/llvm-profdata/Android.bp new file mode 100644 index 000000000000..320492f65ef1 --- /dev/null +++ b/tools/llvm-profdata/Android.bp @@ -0,0 +1,15 @@ +//===---------------------------------------------------------------=== +// llvm-profdata command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-profdata", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["llvm-profdata.cpp"], + static_libs: [ + "libLLVMObject", + "libLLVMProfileData", + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/tools/llvm-profdata/Android.mk b/tools/llvm-profdata/Android.mk deleted file mode 100644 index 663bcbb8dda1..000000000000 --- a/tools/llvm-profdata/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-profdata command line tool -#===---------------------------------------------------------------=== - -llvm_profdata_SRC_FILES := \ - llvm-profdata.cpp - -llvm_profdata_STATIC_LIBRARIES := \ - libLLVMObject \ - libLLVMProfileData \ - libLLVMCore \ - libLLVMSupport \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-profdata -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_profdata_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_profdata_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-readobj/Android.bp b/tools/llvm-readobj/Android.bp new file mode 100644 index 000000000000..42f85eadb30d --- /dev/null +++ b/tools/llvm-readobj/Android.bp @@ -0,0 +1,22 @@ +//===---------------------------------------------------------------=== +// llvm-readobj command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-readobj", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["*.cpp"], + static_libs: [ + "libLLVMARMInfo", + "libLLVMAArch64Info", + "libLLVMMipsInfo", + "libLLVMX86Info", + "libLLVMDebugInfoCodeView", + "libLLVMObject", + "libLLVMBitReader", + "libLLVMMC", + "libLLVMMCParser", + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/tools/llvm-readobj/Android.mk b/tools/llvm-readobj/Android.mk deleted file mode 100644 index c63780053275..000000000000 --- a/tools/llvm-readobj/Android.mk +++ /dev/null @@ -1,41 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-readobj command line tool -#===---------------------------------------------------------------=== - -llvm_readobj_SRC_FILES := $(sort $(notdir $(wildcard $(LOCAL_PATH)/*.cpp))) - -llvm_readobj_STATIC_LIBRARIES := \ - libLLVMARMInfo \ - libLLVMAArch64Info \ - libLLVMMipsInfo \ - libLLVMX86Info \ - libLLVMDebugInfoCodeView \ - libLLVMObject \ - libLLVMBitReader \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMCore \ - libLLVMSupport \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-readobj -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_readobj_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_readobj_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-rtdyld/Android.bp b/tools/llvm-rtdyld/Android.bp new file mode 100644 index 000000000000..b930027c6240 --- /dev/null +++ b/tools/llvm-rtdyld/Android.bp @@ -0,0 +1,49 @@ +//===---------------------------------------------------------------=== +// llvm-rtdyld command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-rtdyld", + defaults: ["llvm-defaults", "llvm-generated-headers"], + 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-rtdyld/Android.mk b/tools/llvm-rtdyld/Android.mk deleted file mode 100644 index 853c71a983b9..000000000000 --- a/tools/llvm-rtdyld/Android.mk +++ /dev/null @@ -1,69 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-rtdyld command line tool -#===---------------------------------------------------------------=== - -llvm_rtdyld_SRC_FILES := \ - llvm-rtdyld.cpp - -llvm_rtdyld_STATIC_LIBRARIES := \ - 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 \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-rtdyld -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_rtdyld_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_rtdyld_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-size/Android.bp b/tools/llvm-size/Android.bp new file mode 100644 index 000000000000..4f165178a7a9 --- /dev/null +++ b/tools/llvm-size/Android.bp @@ -0,0 +1,17 @@ +//===---------------------------------------------------------------=== +// llvm-size command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "llvm-size", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["llvm-size.cpp"], + static_libs: [ + "libLLVMObject", + "libLLVMMC", + "libLLVMMCParser", + "libLLVMBitReader", + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/tools/llvm-size/Android.mk b/tools/llvm-size/Android.mk deleted file mode 100644 index 4c26cce07f57..000000000000 --- a/tools/llvm-size/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# llvm-size command line tool -#===---------------------------------------------------------------=== - -llvm_size_SRC_FILES := \ - llvm-size.cpp - -llvm_size_STATIC_LIBRARIES := \ - libLLVMObject \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMBitReader \ - libLLVMCore \ - libLLVMSupport - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-size -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_size_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(llvm_size_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-split/Android.bp b/tools/llvm-split/Android.bp new file mode 100644 index 000000000000..f623511fbc6c --- /dev/null +++ b/tools/llvm-split/Android.bp @@ -0,0 +1,15 @@ +cc_binary_host { + name: "llvm-split", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["llvm-split.cpp"], + static_libs: [ + "libLLVMIRReader", + "libLLVMBitReader", + "libLLVMBitWriter", + "libLLVMTransformUtils", + "libLLVMAnalysis", + "libLLVMCore", + "libLLVMAsmParser", + "libLLVMSupport", + ], +} diff --git a/tools/llvm-split/Android.mk b/tools/llvm-split/Android.mk deleted file mode 100644 index 334bc717c5d2..000000000000 --- a/tools/llvm-split/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -llvm_split_SRC_FILES := \ - llvm-split.cpp - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-split -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(llvm_split_SRC_FILES) -LOCAL_LDLIBS += -lm -LOCAL_LDLIBS_windows := -limagehlp -lversion -LOCAL_LDLIBS_darwin := -lpthread -ldl -LOCAL_LDLIBS_linux := -lpthread -ldl - -LOCAL_STATIC_LIBRARIES := \ - libLLVMIRReader \ - libLLVMBitReader \ - libLLVMBitWriter \ - libLLVMTransformUtils \ - libLLVMAnalysis \ - libLLVMCore \ - libLLVMAsmParser \ - libLLVMSupport - -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-symbolizer/Android.bp b/tools/llvm-symbolizer/Android.bp new file mode 100644 index 000000000000..5a3337db1d00 --- /dev/null +++ b/tools/llvm-symbolizer/Android.bp @@ -0,0 +1,24 @@ +cc_binary { + name: "llvm-symbolizer", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["llvm-symbolizer.cpp"], + target: { + host: { + static_libs: [ + "libLLVMSymbolize", + "libLLVMDebugInfoDWARF", + "libLLVMDebugInfoPDB", + "libLLVMDebugInfoCodeView", + "libLLVMObject", + "libLLVMBitReader", + "libLLVMMC", + "libLLVMMCParser", + "libLLVMCore", + "libLLVMSupport", + ], + }, + android: { + shared_libs: ["libLLVM"], + }, + }, +} diff --git a/tools/llvm-symbolizer/Android.mk b/tools/llvm-symbolizer/Android.mk deleted file mode 100644 index 5e9fb40a8bb0..000000000000 --- a/tools/llvm-symbolizer/Android.mk +++ /dev/null @@ -1,43 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. -include $(LLVM_ROOT_PATH)/llvm.mk - -llvm_symbolizer_SRC_FILES := \ - llvm-symbolizer.cpp - -include $(CLEAR_VARS) - -LOCAL_MODULE := llvm-symbolizer -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(llvm_symbolizer_SRC_FILES) -LOCAL_LDLIBS += -lpthread -lm -ldl - -LOCAL_STATIC_LIBRARIES := \ - libLLVMSymbolize \ - libLLVMDebugInfoDWARF \ - libLLVMDebugInfoPDB \ - libLLVMDebugInfoCodeView \ - libLLVMObject \ - libLLVMBitReader \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMCore \ - libLLVMSupport - -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) - -include $(CLEAR_VARS) - -ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS)) -LOCAL_MODULE := llvm-symbolizer -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_SRC_FILES := $(llvm_symbolizer_SRC_FILES) -LOCAL_SHARED_LIBRARIES := libLLVM - -include $(LLVM_DEVICE_BUILD_MK) -include $(BUILD_EXECUTABLE) -endif diff --git a/tools/lto/Android.bp b/tools/lto/Android.bp new file mode 100644 index 000000000000..654d63aebbd7 --- /dev/null +++ b/tools/lto/Android.bp @@ -0,0 +1,90 @@ +// +// 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", "llvm-generated-headers"], + 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/lto/Android.mk b/tools/lto/Android.mk deleted file mode 100644 index 503835a05fa1..000000000000 --- a/tools/lto/Android.mk +++ /dev/null @@ -1,107 +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. -# - -LOCAL_PATH:= $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../../ -include $(LLVM_ROOT_PATH)/llvm.mk - -# For the host only -# ===================================================== -include $(CLEAR_VARS) -include $(CLEAR_TBLGEN_VARS) - -LOCAL_MODULE := libLTO - -LOCAL_MODULE_CLASS := SHARED_LIBRARIES - -llvm_lto_SRC_FILES := \ - lto.cpp \ - LTODisassembler.cpp - -LOCAL_SRC_FILES := $(llvm_lto_SRC_FILES) - -llvm_lto_STATIC_LIBRARIES := \ - 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 - -LOCAL_LDLIBS_darwin := -lpthread -ldl -LOCAL_LDLIBS_linux := -lpthread -ldl - -LOCAL_STATIC_LIBRARIES := $(llvm_lto_STATIC_LIBRARIES) $(llvm_lto_STATIC_LIBRARIES) - -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/tools/obj2yaml/Android.bp b/tools/obj2yaml/Android.bp new file mode 100644 index 000000000000..64d766d5ec63 --- /dev/null +++ b/tools/obj2yaml/Android.bp @@ -0,0 +1,18 @@ +//===---------------------------------------------------------------=== +// obj2yaml command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "obj2yaml", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["*.cpp"], + static_libs: [ + "libLLVMObject", + "libLLVMObjectYAML", + "libLLVMMC", + "libLLVMMCParser", + "libLLVMBitReader", + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/tools/obj2yaml/Android.mk b/tools/obj2yaml/Android.mk deleted file mode 100644 index 19dc9ca99643..000000000000 --- a/tools/obj2yaml/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# obj2yaml command line tool -#===---------------------------------------------------------------=== - -obj2yaml_SRC_FILES := $(sort $(notdir $(wildcard $(LOCAL_PATH)/*.cpp))) - -obj2yaml_STATIC_LIBRARIES := \ - libLLVMObject \ - libLLVMObjectYAML \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMBitReader \ - libLLVMCore \ - libLLVMSupport \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := obj2yaml -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(obj2yaml_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(obj2yaml_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/opt/Android.bp b/tools/opt/Android.bp new file mode 100644 index 000000000000..a6b940b7318a --- /dev/null +++ b/tools/opt/Android.bp @@ -0,0 +1,69 @@ +//===---------------------------------------------------------------=== +// opt command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "opt", + defaults: ["llvm-defaults", "llvm-generated-headers"], + 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/opt/Android.mk b/tools/opt/Android.mk deleted file mode 100644 index 7b8ab6d79014..000000000000 --- a/tools/opt/Android.mk +++ /dev/null @@ -1,106 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# opt command line tool -#===---------------------------------------------------------------=== - -llvm_opt_SRC_FILES := \ - AnalysisWrappers.cpp \ - BreakpointPrinter.cpp \ - GraphPrinters.cpp \ - NewPMDriver.cpp \ - PassPrinters.cpp \ - PrintSCC.cpp \ - opt.cpp \ - -llvm_opt_STATIC_LIBRARIES := \ - 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 \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := opt -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_opt_SRC_FILES) -LOCAL_STATIC_LIBRARIES := $(llvm_opt_STATIC_LIBRARIES) -LOCAL_LDLIBS += -lpthread -ldl -LOCAL_LDFLAGS_darwin := -Wl,-export_dynamic -LOCAL_LDFLAGS_linux := -Wl,--export-dynamic - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) - - -ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS)) -include $(CLEAR_VARS) - -LOCAL_MODULE := opt -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES - -LOCAL_SRC_FILES := $(llvm_opt_SRC_FILES) -LOCAL_STATIC_LIBRARIES := $(llvm_opt_STATIC_LIBRARIES) - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_DEVICE_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_EXECUTABLE) -endif diff --git a/tools/sancov/Android.bp b/tools/sancov/Android.bp new file mode 100644 index 000000000000..aa9430e2c546 --- /dev/null +++ b/tools/sancov/Android.bp @@ -0,0 +1,63 @@ +//===---------------------------------------------------------------=== +// sancov command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "sancov", + defaults: ["llvm-defaults", "llvm-generated-headers"], + 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/sancov/Android.mk b/tools/sancov/Android.mk deleted file mode 100644 index de67342326cd..000000000000 --- a/tools/sancov/Android.mk +++ /dev/null @@ -1,77 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# sancov command line tool -#===---------------------------------------------------------------=== - -llvm_sancov_SRC_FILES := \ - sancov.cc \ - -llvm_sancov_STATIC_LIBRARIES := \ - 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 \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := sancov - -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES := $(llvm_sancov_SRC_FILES) -LOCAL_STATIC_LIBRARIES := $(llvm_sancov_STATIC_LIBRARIES) - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/sanstats/Android.bp b/tools/sanstats/Android.bp new file mode 100644 index 000000000000..bf53433262f4 --- /dev/null +++ b/tools/sanstats/Android.bp @@ -0,0 +1,21 @@ +//===---------------------------------------------------------------=== +// sanstats command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "sanstats", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["sanstats.cpp"], + static_libs: [ + "libLLVMSymbolize", + "libLLVMDebugInfoDWARF", + "libLLVMDebugInfoPDB", + "libLLVMDebugInfoCodeView", + "libLLVMObject", + "libLLVMBitReader", + "libLLVMCore", + "libLLVMMCParser", + "libLLVMMC", + "libLLVMSupport", + ], +} diff --git a/tools/sanstats/Android.mk b/tools/sanstats/Android.mk deleted file mode 100644 index 140652ff8b40..000000000000 --- a/tools/sanstats/Android.mk +++ /dev/null @@ -1,38 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# sanstats command line tool -#===---------------------------------------------------------------=== - -llvm_sanstats_SRC_FILES := \ - sanstats.cpp - -llvm_sanstats_STATIC_LIBRARIES := \ - libLLVMSymbolize \ - libLLVMDebugInfoDWARF \ - libLLVMDebugInfoPDB \ - libLLVMDebugInfoCodeView \ - libLLVMObject \ - libLLVMBitReader \ - libLLVMCore \ - libLLVMMCParser \ - libLLVMMC \ - libLLVMSupport - -include $(CLEAR_VARS) - -LOCAL_MODULE := sanstats -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(llvm_sanstats_SRC_FILES) -LOCAL_STATIC_LIBRARIES := $(llvm_sanstats_STATIC_LIBRARIES) - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/verify-uselistorder/Android.bp b/tools/verify-uselistorder/Android.bp new file mode 100644 index 000000000000..3f3d45daace8 --- /dev/null +++ b/tools/verify-uselistorder/Android.bp @@ -0,0 +1,14 @@ +cc_binary_host { + name: "verify-uselistorder", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["verify-uselistorder.cpp"], + static_libs: [ + "libLLVMAsmParser", + "libLLVMBitReader", + "libLLVMBitWriter", + "libLLVMAnalysis", + "libLLVMCore", + "libLLVMIRReader", + "libLLVMSupport", + ], +} diff --git a/tools/verify-uselistorder/Android.mk b/tools/verify-uselistorder/Android.mk deleted file mode 100644 index 1c49733e8659..000000000000 --- a/tools/verify-uselistorder/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. -include $(LLVM_ROOT_PATH)/llvm.mk - -verify_uselistorder_SRC_FILES := \ - verify-uselistorder.cpp - -include $(CLEAR_VARS) - -LOCAL_MODULE := verify-uselistorder -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(verify_uselistorder_SRC_FILES) -LOCAL_LDLIBS += -lpthread -lm -ldl - -LOCAL_STATIC_LIBRARIES := \ - libLLVMAsmParser \ - libLLVMBitReader \ - libLLVMBitWriter \ - libLLVMAnalysis \ - libLLVMCore \ - libLLVMIRReader \ - libLLVMSupport - -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_ATTRIBUTES_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/yaml2obj/Android.bp b/tools/yaml2obj/Android.bp new file mode 100644 index 000000000000..605d21662db6 --- /dev/null +++ b/tools/yaml2obj/Android.bp @@ -0,0 +1,18 @@ +//===---------------------------------------------------------------=== +// yaml2obj command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "yaml2obj", + defaults: ["llvm-defaults", "llvm-generated-headers"], + srcs: ["*.cpp"], + static_libs: [ + "libLLVMObject", + "libLLVMObjectYAML", + "libLLVMMC", + "libLLVMMCParser", + "libLLVMBitReader", + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/tools/yaml2obj/Android.mk b/tools/yaml2obj/Android.mk deleted file mode 100644 index 2f62fec5ce6e..000000000000 --- a/tools/yaml2obj/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# yaml2obj command line tool -#===---------------------------------------------------------------=== - -yaml2obj_SRC_FILES := $(sort $(notdir $(wildcard $(LOCAL_PATH)/*.cpp))) - -yaml2obj_STATIC_LIBRARIES := \ - libLLVMObject \ - libLLVMObjectYAML \ - libLLVMMC \ - libLLVMMCParser \ - libLLVMBitReader \ - libLLVMCore \ - libLLVMSupport \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := yaml2obj -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(yaml2obj_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(yaml2obj_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_GEN_INTRINSICS_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/utils/FileCheck/Android.bp b/utils/FileCheck/Android.bp new file mode 100644 index 000000000000..e21b9de8b968 --- /dev/null +++ b/utils/FileCheck/Android.bp @@ -0,0 +1,10 @@ +cc_binary_host { + name: "FileCheck", + defaults: ["llvm-defaults"], + srcs: ["FileCheck.cpp"], + static_libs: ["libLLVMSupport"], + cflags: [ + "-D__STDC_LIMIT_MACROS", + "-D__STDC_CONSTANT_MACROS", + ], +} diff --git a/utils/FileCheck/Android.mk b/utils/FileCheck/Android.mk deleted file mode 100644 index 3d32008e09bd..000000000000 --- a/utils/FileCheck/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -filecheck_SRC_FILES := \ - FileCheck.cpp - -filecheck_STATIC_LIBRARIES := \ - libLLVMSupport - -include $(CLEAR_VARS) - -LOCAL_MODULE := FileCheck -LOCAL_SRC_FILES := $(filecheck_SRC_FILES) -LOCAL_STATIC_LIBRARIES := $(filecheck_STATIC_LIBRARIES) -LOCAL_C_INCLUDES += external/llvm/host/include -LOCAL_LDLIBS += -lpthread -lm -ldl -LOCAL_CFLAGS += -D __STDC_LIMIT_MACROS -D __STDC_CONSTANT_MACROS - -#REQUIRES_EH := 1 -#REQUIRES_RTTI := 1 - -include $(LLVM_HOST_BUILD_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/utils/count/Android.bp b/utils/count/Android.bp new file mode 100644 index 000000000000..1d438093a66f --- /dev/null +++ b/utils/count/Android.bp @@ -0,0 +1,9 @@ +//===---------------------------------------------------------------=== +// count command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "count", + defaults: ["llvm-defaults"], + srcs: ["count.c"], +} diff --git a/utils/count/Android.mk b/utils/count/Android.mk deleted file mode 100644 index 1ee8271b631c..000000000000 --- a/utils/count/Android.mk +++ /dev/null @@ -1,26 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# count command line tool -#===---------------------------------------------------------------=== - -count_SRC_FILES := \ - count.c - -include $(CLEAR_VARS) - -LOCAL_MODULE := count -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(count_SRC_FILES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/utils/not/Android.bp b/utils/not/Android.bp new file mode 100644 index 000000000000..25a2f83e49ea --- /dev/null +++ b/utils/not/Android.bp @@ -0,0 +1,13 @@ +//===---------------------------------------------------------------=== +// not command line tool +//===---------------------------------------------------------------=== + +cc_binary_host { + name: "not", + defaults: ["llvm-defaults"], + srcs: ["not.cpp"], + static_libs: [ + "libLLVMCore", + "libLLVMSupport", + ], +} diff --git a/utils/not/Android.mk b/utils/not/Android.mk deleted file mode 100644 index 93d2a46c0939..000000000000 --- a/utils/not/Android.mk +++ /dev/null @@ -1,32 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -#===---------------------------------------------------------------=== -# not command line tool -#===---------------------------------------------------------------=== - -not_SRC_FILES := \ - not.cpp - -not_STATIC_LIBRARIES := \ - libLLVMCore \ - libLLVMSupport \ - -include $(CLEAR_VARS) - -LOCAL_MODULE := not -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(not_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(not_STATIC_LIBRARIES) - -LOCAL_LDLIBS += -lpthread -lm -ldl - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(BUILD_HOST_EXECUTABLE) diff --git a/utils/yaml-bench/Android.bp b/utils/yaml-bench/Android.bp new file mode 100644 index 000000000000..df5092fbc84e --- /dev/null +++ b/utils/yaml-bench/Android.bp @@ -0,0 +1,9 @@ +// yaml-bench executable for the host +// ===================================================== + +cc_binary_host { + name: "yaml-bench", + defaults: ["llvm-defaults"], + srcs: ["YAMLBench.cpp"], + static_libs: ["libLLVMSupport"], +} diff --git a/utils/yaml-bench/Android.mk b/utils/yaml-bench/Android.mk deleted file mode 100644 index 79db8996f6b2..000000000000 --- a/utils/yaml-bench/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. - - -yaml_bench_SRC_FILES := \ - YAMLBench.cpp - -yaml_bench_STATIC_LIBRARIES := \ - libLLVMSupport \ - -# yaml-bench executable for the host -# ===================================================== - -include $(CLEAR_VARS) - -LOCAL_MODULE := yaml-bench -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -LOCAL_SRC_FILES := $(yaml_bench_SRC_FILES) - -LOCAL_STATIC_LIBRARIES := $(yaml_bench_STATIC_LIBRARIES) - -include $(LLVM_ROOT_PATH)/llvm.mk -include $(LLVM_HOST_BUILD_MK) -include $(BUILD_HOST_EXECUTABLE) |