am f13bcf2b: Merge "Require python 2.7."

[android-x86/external-llvm.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 5bd2170..1f4421c 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,46 +4,123 @@ LLVM_ENABLE_ASSERTION := false
 
 include $(CLEAR_VARS)
 
-subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
+# LLVM Libraries
+subdirs := \
   lib/Analysis \
   lib/Analysis/IPA \
   lib/AsmParser \
   lib/Bitcode/Reader \
   lib/Bitcode/Writer \
-  lib/ExecutionEngine/JIT \
+  lib/ExecutionEngine \
+  lib/ExecutionEngine/RuntimeDyld \
+  lib/ExecutionEngine/MCJIT \
+  lib/ExecutionEngine/Interpreter \
   lib/CodeGen \
   lib/CodeGen/AsmPrinter \
   lib/CodeGen/SelectionDAG \
+  lib/DebugInfo \
+  lib/IR \
+  lib/IRReader \
   lib/Linker \
+  lib/LTO \
   lib/MC \
+  lib/MC/MCDisassembler \
   lib/MC/MCParser \
+  lib/Object \
+  lib/Option \
+  lib/ProfileData \
   lib/Support \
+  lib/TableGen \
   lib/Target \
+  lib/Transforms/Hello \
+  lib/Transforms/IPO \
+  lib/Transforms/InstCombine \
+  lib/Transforms/Instrumentation \
+  lib/Transforms/ObjCARC \
+  lib/Transforms/Scalar \
+  lib/Transforms/Utils \
+  lib/Transforms/Vectorize \
+
+# ARM Code Generation Libraries
+subdirs += \
   lib/Target/ARM \
   lib/Target/ARM/AsmParser \
   lib/Target/ARM/InstPrinter \
   lib/Target/ARM/Disassembler \
   lib/Target/ARM/MCTargetDesc \
-  lib/Target/ARM/TargetInfo \
+  lib/Target/ARM/TargetInfo
+
+# AArch64 Code Generation Libraries
+subdirs += \
+  lib/Target/AArch64  \
+  lib/Target/AArch64/AsmParser \
+  lib/Target/AArch64/InstPrinter \
+  lib/Target/AArch64/Disassembler \
+  lib/Target/AArch64/MCTargetDesc \
+  lib/Target/AArch64/TargetInfo \
+  lib/Target/AArch64/Utils
+
+# MIPS Code Generation Libraries
+subdirs += \
+  lib/Target/Mips \
+  lib/Target/Mips/AsmParser \
+  lib/Target/Mips/InstPrinter \
+  lib/Target/Mips/Disassembler \
+  lib/Target/Mips/MCTargetDesc \
+  lib/Target/Mips/TargetInfo
+
+# X86 Code Generation Libraries
+subdirs += \
   lib/Target/X86 \
   lib/Target/X86/AsmParser \
   lib/Target/X86/InstPrinter \
   lib/Target/X86/Disassembler \
   lib/Target/X86/MCTargetDesc \
   lib/Target/X86/TargetInfo \
-  lib/Target/X86/Utils \
-  lib/Transforms/IPO \
-  lib/Transforms/InstCombine \
-  lib/Transforms/Instrumentation \
-  lib/Transforms/Scalar \
-  lib/Transforms/Utils \
-  lib/VMCore \
-  utils/TableGen \
+  lib/Target/X86/Utils
+
+# LLVM Command Line Tools
+subdirs += \
+  tools/bugpoint \
+  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-dis \
+  tools/llvm-diff \
+  tools/llvm-dwarfdump \
+  tools/llvm-extract \
   tools/llvm-link \
-  ))
+  tools/llvm-lto \
+  tools/llvm-mc \
+  tools/llvm-mcmarkup \
+  tools/llvm-nm \
+  tools/llvm-objdump \
+  tools/llvm-profdata \
+  tools/llvm-readobj \
+  tools/llvm-rtdyld \
+  tools/llvm-size \
+  tools/llvm-symbolizer \
+  tools/llvm-vtabledump \
+  tools/macho-dump \
+  tools/obj2yaml \
+  tools/opt \
+  tools/verify-uselistorder \
+  tools/yaml2obj \
 
-include $(LOCAL_PATH)/llvm.mk
+# LLVM Command Line Utilities
+subdirs += \
+  utils/count \
+  utils/FileCheck \
+  utils/not \
+  utils/TableGen \
 
-include $(subdirs)
+include $(LOCAL_PATH)/llvm.mk
+include $(LOCAL_PATH)/shared_llvm.mk
 
+include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, $(subdirs)))