Add disassembler
Change-Id: I0b7aa48ee758f9a9ccf3db63c647fb339d0dc35b
diff --git a/Android.mk b/Android.mk
index 655745a..a9f8794 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,6 +3,8 @@
LOCAL_PATH := $(call my-dir)
LLVM_ROOT_PATH := external/llvm/llvm
+USE_DISASSEMBLER := true
+
# Shared library for target
# ========================================================
include $(CLEAR_VARS)
@@ -44,9 +46,7 @@
runtime/lib/arm/subsf3vfp.S \
runtime/lib/arm/truncdfsf2vfp.S \
runtime/lib/arm/unorddf2vfp.S \
- runtime/lib/arm/unordsf2vfp.S #\
-# disassembler/arm-dis.c \
-# disassembler/dis-asm.c
+ runtime/lib/arm/unordsf2vfp.S
LOCAL_STATIC_LIBRARIES := \
libLLVMARMCodeGen \
@@ -68,9 +68,16 @@
LOCAL_SHARED_LIBRARIES := libdl libcutils libstlport
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include $(LOCAL_PATH)/disassembler
+ $(LOCAL_PATH)/include
-#LOCAL_CFLAGS := -DUSE_DISASSEMBLER
+ifeq ($(USE_DISASSEMBLER),true)
+LOCAL_CFLAGS += -DUSE_DISASSEMBLER
+LOCAL_STATIC_LIBRARIES := \
+ libLLVMARMDisassembler \
+ libLLVMARMAsmPrinter \
+ libLLVMMCParser \
+ $(LOCAL_STATIC_LIBRARIES)
+endif
include $(LLVM_ROOT_PATH)/llvm-device-build.mk
include $(BUILD_SHARED_LIBRARY)
@@ -89,6 +96,7 @@
libLLVMBitReader \
libLLVMSelectionDAG \
libLLVMAsmPrinter \
+ libLLVMMCParser \
libLLVMCodeGen \
libLLVMJIT \
libLLVMTarget \
@@ -105,6 +113,14 @@
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include
+ifeq ($(USE_DISASSEMBLER),true)
+LOCAL_CFLAGS += -DUSE_DISASSEMBLER
+LOCAL_STATIC_LIBRARIES := \
+ libLLVMX86Disassembler \
+ libLLVMX86AsmPrinter \
+ $(LOCAL_STATIC_LIBRARIES)
+endif
+
include $(LLVM_ROOT_PATH)/llvm-host-build.mk
include $(BUILD_HOST_SHARED_LIBRARY)