Remove unnecessary patches/ directory.

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

diff --git a/Android.mk b/Android.mk
index 1f4421c..c86080b 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,17 @@
 LOCAL_PATH := $(call my-dir)
 LLVM_ROOT_PATH := $(LOCAL_PATH)
-LLVM_ENABLE_ASSERTION := false
+
+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)
 
@@ -14,11 +25,13 @@ subdirs := \
   lib/ExecutionEngine \
   lib/ExecutionEngine/RuntimeDyld \
   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 \
@@ -28,6 +41,7 @@ subdirs := \
   lib/MC/MCParser \
   lib/Object \
   lib/Option \
+  lib/Passes \
   lib/ProfileData \
   lib/Support \
   lib/TableGen \
@@ -82,6 +96,8 @@ subdirs += \
 # LLVM Command Line Tools
 subdirs += \
   tools/bugpoint \
+  tools/bugpoint-passes \
+  tools/dsymutil \
   tools/llc \
   tools/lli \
   tools/lli/ChildTarget \
@@ -91,6 +107,7 @@ subdirs += \
   tools/llvm-c-test \
   tools/llvm-config \
   tools/llvm-cov \
+  tools/llvm-cxxdump \
   tools/llvm-dis \
   tools/llvm-diff \
   tools/llvm-dwarfdump \
@@ -101,12 +118,12 @@ subdirs += \
   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-symbolizer \
-  tools/llvm-vtabledump \
   tools/macho-dump \
   tools/obj2yaml \
   tools/opt \