aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk2
-rw-r--r--lib/Target/ARM/AsmParser/Android.mk11
2 files changed, 9 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index b972a0a..e133a62 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,10 +27,12 @@ subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
lib/Target \
lib/Target/ARM \
lib/Target/ARM/AsmPrinter \
+ lib/Target/ARM/AsmParser \
lib/Target/ARM/Disassembler \
lib/Target/ARM/TargetInfo \
lib/Target/X86 \
lib/Target/X86/AsmPrinter \
+ lib/Target/X86/AsmParser \
lib/Target/X86/Disassembler \
lib/Target/X86/TargetInfo \
lib/ExecutionEngine/JIT \
diff --git a/lib/Target/ARM/AsmParser/Android.mk b/lib/Target/ARM/AsmParser/Android.mk
index b862991..552dedd 100644
--- a/lib/Target/ARM/AsmParser/Android.mk
+++ b/lib/Target/ARM/AsmParser/Android.mk
@@ -1,6 +1,6 @@
LOCAL_PATH := $(call my-dir)
-# For the device only
+# For the host only
# =====================================================
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
@@ -8,7 +8,8 @@ include $(CLEAR_TBLGEN_VARS)
TBLGEN_TABLES := \
ARMGenInstrNames.inc \
ARMGenRegisterNames.inc \
- ARMGenRegisterInfo.h.inc
+ ARMGenRegisterInfo.h.inc \
+ ARMGenAsmMatcher.inc
TBLGEN_TD_DIR := $(LOCAL_PATH)/..
@@ -22,6 +23,8 @@ LOCAL_C_INCLUDES += \
LOCAL_MODULE:= libLLVMARMAsmParser
-include $(LLVM_DEVICE_BUILD_MK)
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_HOST_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_HOST_STATIC_LIBRARY)