am f13bcf2b: Merge "Require python 2.7."

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

diff --git a/Android.mk b/Android.mk
index b5925b7..1f4421c 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -8,30 +8,38 @@ include $(CLEAR_VARS)
 subdirs := \
   lib/Analysis \
   lib/Analysis/IPA \
-  lib/Archive \
   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 \
-  lib/VMCore \
-  utils/FileCheck \
-  utils/TableGen
 
 # ARM Code Generation Libraries
 subdirs += \
@@ -42,6 +50,16 @@ subdirs += \
   lib/Target/ARM/MCTargetDesc \
   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 \
@@ -62,13 +80,47 @@ subdirs += \
   lib/Target/X86/Utils
 
 # LLVM Command Line Tools
-#subdirs += tools/llc
-subdirs += tools/llvm-as
-subdirs += tools/llvm-dis
-subdirs += tools/llvm-ld
-subdirs += tools/llvm-link
-#subdirs += tools/opt
+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 \
 
+# LLVM Command Line Utilities
+subdirs += \
+  utils/count \
+  utils/FileCheck \
+  utils/not \
+  utils/TableGen \
 
 include $(LOCAL_PATH)/llvm.mk
+include $(LOCAL_PATH)/shared_llvm.mk
+
 include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, $(subdirs)))