Merge "Update aosp/master LLVM for rebase to r230699."

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

diff --git a/Android.mk b/Android.mk
index d456977..bc628e1 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -13,13 +13,14 @@ subdirs := \
   lib/Bitcode/Writer \
   lib/ExecutionEngine \
   lib/ExecutionEngine/RuntimeDyld \
-  lib/ExecutionEngine/JIT \
   lib/ExecutionEngine/MCJIT \
+  lib/ExecutionEngine/Orc \
   lib/ExecutionEngine/Interpreter \
   lib/CodeGen \
   lib/CodeGen/AsmPrinter \
   lib/CodeGen/SelectionDAG \
-  lib/DebugInfo \
+  lib/DebugInfo/DWARF \
+  lib/DebugInfo/PDB \
   lib/IR \
   lib/IRReader \
   lib/Linker \
@@ -33,6 +34,7 @@ subdirs := \
   lib/Support \
   lib/TableGen \
   lib/Target \
+  lib/Transforms/Hello \
   lib/Transforms/IPO \
   lib/Transforms/InstCombine \
   lib/Transforms/Instrumentation \
@@ -84,6 +86,7 @@ subdirs += \
   tools/bugpoint \
   tools/llc \
   tools/lli \
+  tools/lli/ChildTarget \
   tools/llvm-ar \
   tools/llvm-as \
   tools/llvm-bcanalyzer \
@@ -104,16 +107,18 @@ subdirs += \
   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/FileUpdate \
   utils/not \
   utils/TableGen \