diff options
| author | Shih-wei Liao <sliao@google.com> | 2010-12-04 21:34:01 -0800 |
|---|---|---|
| committer | Shih-wei Liao <sliao@google.com> | 2010-12-04 21:34:01 -0800 |
| commit | 7389b98289f7fb09c1641e07044ff816a56f4eba (patch) | |
| tree | 9d8205f9920e9a77ba926ec5abe63df9aed13e4e | |
| parent | 6d73b8b01a0d3aa4b476ac4fbc1ac27d701ae78b (diff) | |
| download | external_llvm-7389b98289f7fb09c1641e07044ff816a56f4eba.zip external_llvm-7389b98289f7fb09c1641e07044ff816a56f4eba.tar.gz external_llvm-7389b98289f7fb09c1641e07044ff816a56f4eba.tar.bz2 | |
Fix Android.mk's
Change-Id: I4de9583db7f8d47bdda444804aecaeb71c5dfcb8
| -rw-r--r-- | Android.mk | 84 | ||||
| -rw-r--r-- | lib/Target/ARM/Disassembler/Android.mk | 43 |
2 files changed, 56 insertions, 71 deletions
@@ -1,52 +1,42 @@ LOCAL_PATH := $(call my-dir) +LLVM_ROOT_PATH := $(LOCAL_PATH) +LLVM_ENABLE_ASSERTION := false -arm_disassembler_TBLGEN_TABLES := \ - ARMGenDecoderTables.inc \ - ARMGenEDInfo.inc \ - ARMGenInstrNames.inc \ - ARMGenInstrInfo.inc \ - ARMGenRegisterNames.inc \ - ARMGenRegisterInfo.h.inc - -arm_disassembler_SRC_FILES := \ - ARMDisassembler.cpp \ - ARMDisassemblerCore.cpp - -# For the device -# ===================================================== include $(CLEAR_VARS) -include $(CLEAR_TBLGEN_VARS) - -TBLGEN_TABLES := $(arm_disassembler_TBLGEN_TABLES) - -TBLGEN_TD_DIR := $(LOCAL_PATH)/.. - -LOCAL_SRC_FILES := $(arm_disassembler_SRC_FILES) - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. - -LOCAL_MODULE:= libLLVMARMDisassembler - -include $(LLVM_DEVICE_BUILD_MK) -include $(LLVM_TBLGEN_RULES_MK) -include $(BUILD_STATIC_LIBRARY) - -# For the host -# ===================================================== -include $(CLEAR_VARS) -include $(CLEAR_TBLGEN_VARS) - -TBLGEN_TABLES := $(arm_disassembler_TBLGEN_TABLES) - -TBLGEN_TD_DIR := $(LOCAL_PATH)/.. - -LOCAL_SRC_FILES := $(arm_disassembler_SRC_FILES) - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. - -LOCAL_MODULE:= libLLVMARMDisassembler -include $(LLVM_HOST_BUILD_MK) -include $(LLVM_TBLGEN_RULES_MK) -include $(BUILD_HOST_STATIC_LIBRARY) +subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \ + lib/System \ + lib/Support \ + utils/TableGen \ + lib/VMCore \ + lib/Bitcode/Reader \ + lib/Bitcode/Writer \ + lib/Analysis \ + lib/Analysis/IPA \ + lib/Transforms/IPO \ + lib/Transforms/Utils \ + lib/Transforms/Scalar \ + lib/Transforms/InstCombine \ + lib/Transforms/Instrumentation \ + lib/CodeGen \ + lib/CodeGen/SelectionDAG \ + lib/CodeGen/AsmPrinter \ + lib/Target \ + lib/Target/ARM \ + lib/Target/ARM/AsmPrinter \ + lib/Target/ARM/Disassembler \ + lib/Target/ARM/TargetInfo \ + lib/Target/X86 \ + lib/Target/X86/AsmPrinter \ + lib/Target/X86/Disassembler \ + lib/Target/X86/TargetInfo \ + lib/ExecutionEngine/JIT \ + lib/MC \ + lib/MC/MCParser \ + lib/Linker \ + )) + +include $(LOCAL_PATH)/llvm.mk + +include $(subdirs) diff --git a/lib/Target/ARM/Disassembler/Android.mk b/lib/Target/ARM/Disassembler/Android.mk index e4bb9cc..3ae8987 100644 --- a/lib/Target/ARM/Disassembler/Android.mk +++ b/lib/Target/ARM/Disassembler/Android.mk @@ -1,26 +1,29 @@ LOCAL_PATH := $(call my-dir) +arm_disassembler_TBLGEN_TABLES := \ + ARMGenDecoderTables.inc \ + ARMGenEDInfo.inc \ + ARMGenInstrNames.inc \ + ARMGenInstrInfo.inc \ + ARMGenRegisterNames.inc \ + ARMGenRegisterInfo.h.inc + +arm_disassembler_SRC_FILES := \ + ARMDisassembler.cpp \ + ARMDisassemblerCore.cpp + # For the device # ===================================================== include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) -TBLGEN_TABLES := \ - ARMGenDecoderTables.inc \ - ARMGenEDInfo.inc \ - ARMGenInstrNames.inc \ - ARMGenInstrInfo.inc \ - ARMGenRegisterNames.inc \ - ARMGenRegisterInfo.h.inc +TBLGEN_TABLES := $(arm_disassembler_TBLGEN_TABLES) TBLGEN_TD_DIR := $(LOCAL_PATH)/.. -LOCAL_SRC_FILES := \ - ARMDisassembler.cpp \ - ARMDisassemblerCore.cpp +LOCAL_SRC_FILES := $(arm_disassembler_SRC_FILES) -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/.. +LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. LOCAL_MODULE:= libLLVMARMDisassembler @@ -33,25 +36,17 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) -TBLGEN_TABLES := \ - ARMGenDecoderTables.inc \ - ARMGenEDInfo.inc \ - ARMGenInstrNames.inc \ - ARMGenInstrInfo.inc \ - ARMGenRegisterNames.inc \ - ARMGenRegisterInfo.h.inc +TBLGEN_TABLES := $(arm_disassembler_TBLGEN_TABLES) TBLGEN_TD_DIR := $(LOCAL_PATH)/.. -LOCAL_SRC_FILES := \ - ARMDisassembler.cpp \ - ARMDisassemblerCore.cpp +LOCAL_SRC_FILES := $(arm_disassembler_SRC_FILES) -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/.. +LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. LOCAL_MODULE:= libLLVMARMDisassembler include $(LLVM_HOST_BUILD_MK) include $(LLVM_TBLGEN_RULES_MK) include $(BUILD_HOST_STATIC_LIBRARY) + |