Initial slang.

Change-Id: I4f84a741e5fbc440cd4c251406d2b611a237f713

4 files changed, 108 insertions, 23 deletions

diff --git a/lib/Bitcode/Writer/Android.mk b/lib/Bitcode/Writer/Android.mk
new file mode 100644
index 0000000..5147c46
--- /dev/null
+++ b/lib/Bitcode/Writer/Android.mk
@@ -0,0 +1,17 @@
+LOCAL_PATH:= $(call my-dir)
+
+# For the host only
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES :=	\
+	BitWriter.cpp	\
+	BitcodeWriter.cpp	\
+	BitcodeWriterPass.cpp	\
+	ValueEnumerator.cpp
+
+LOCAL_MODULE:= libLLVMBitWriter
+
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index d91bd38..e4d2f68 100644
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -1,11 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-# For the device only
-# =====================================================
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-TBLGEN_TABLES :=	\
+arm_codegen_TBLGEN_TABLES :=	\
 	ARMGenRegisterInfo.h.inc	\
 	ARMGenRegisterNames.inc	\
     ARMGenRegisterInfo.inc	\
@@ -16,7 +11,7 @@ TBLGEN_TABLES :=	\
     ARMGenCodeEmitter.inc	\
 	ARMGenCallingConv.inc
 
-LOCAL_SRC_FILES :=	\
+arm_codegen_SRC_FILES :=	\
 	ARMBaseInstrInfo.cpp	\
 	ARMBaseRegisterInfo.cpp	\
 	ARMCodeEmitter.cpp	\
@@ -42,6 +37,31 @@ LOCAL_SRC_FILES :=	\
 	Thumb2RegisterInfo.cpp	\
 	Thumb2SizeReduction.cpp
 
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+include $(CLEAR_TBLGEN_VARS)
+
+TBLGEN_TABLES := $(arm_codegen_TBLGEN_TABLES)
+
+LOCAL_SRC_FILES := $(arm_codegen_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMARMCodeGen
+
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_TBLGEN_RULES_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device only
+# =====================================================
+include $(CLEAR_VARS)
+include $(CLEAR_TBLGEN_VARS)
+
+TBLGEN_TABLES := $(arm_codegen_TBLGEN_TABLES)
+
+LOCAL_SRC_FILES := $(arm_codegen_SRC_FILES)
+
 LOCAL_MODULE:= libLLVMARMCodeGen
 
 include $(LLVM_DEVICE_BUILD_MK)
diff --git a/lib/Target/ARM/AsmPrinter/Android.mk b/lib/Target/ARM/AsmPrinter/Android.mk
index b906904..727ab1d 100644
--- a/lib/Target/ARM/AsmPrinter/Android.mk
+++ b/lib/Target/ARM/AsmPrinter/Android.mk
@@ -1,23 +1,47 @@
 LOCAL_PATH := $(call my-dir)
 
-# For the device only
-# =====================================================
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-TBLGEN_TABLES :=	\
+arm_asm_printer_TBLGEN_TABLES :=	\
 	ARMGenAsmWriter.inc	\
 	ARMGenInstrNames.inc	\
 	ARMGenRegisterNames.inc	\
 	ARMGenRegisterInfo.h.inc
 
-TBLGEN_TD_DIR := $(LOCAL_PATH)/..
-
-LOCAL_SRC_FILES :=	\
+arm_asm_printer_SRC_FILES :=	\
 	ARMAsmPrinter.cpp	\
 	ARMInstPrinter.cpp	\
 	ARMMCInstLower.cpp
 	
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+include $(CLEAR_TBLGEN_VARS)
+
+TBLGEN_TABLES := $(arm_asm_printer_TBLGEN_TABLES)
+
+TBLGEN_TD_DIR := $(LOCAL_PATH)/..
+
+LOCAL_SRC_FILES := $(arm_asm_printer_SRC_FILES)
+
+LOCAL_C_INCLUDES +=	\
+	$(LOCAL_PATH)/..
+
+LOCAL_MODULE:= libLLVMARMAsmPrinter
+
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_TBLGEN_RULES_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+include $(CLEAR_TBLGEN_VARS)
+
+TBLGEN_TABLES := $(arm_asm_printer_TBLGEN_TABLES)
+
+TBLGEN_TD_DIR := $(LOCAL_PATH)/..
+
+LOCAL_SRC_FILES := $(arm_asm_printer_SRC_FILES)
+
 LOCAL_C_INCLUDES +=	\
 	$(LOCAL_PATH)/..
 
diff --git a/lib/Target/ARM/TargetInfo/Android.mk b/lib/Target/ARM/TargetInfo/Android.mk
index c1998a1..9297d36 100644
--- a/lib/Target/ARM/TargetInfo/Android.mk
+++ b/lib/Target/ARM/TargetInfo/Android.mk
@@ -1,19 +1,43 @@
 LOCAL_PATH := $(call my-dir)
 
-# For the device only
+arm_target_info_TBLGEN_TABLES :=	\
+	ARMGenRegisterNames.inc	\
+	ARMGenInstrNames.inc
+
+arm_target_info_SRC_FILES :=	\
+	ARMTargetInfo.cpp
+	
+# For the host
 # =====================================================
 include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
-TBLGEN_TABLES :=	\
-	ARMGenRegisterNames.inc	\
-	ARMGenInstrNames.inc
+TBLGEN_TABLES := $(arm_target_info_TBLGEN_TABLES)
 
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
-LOCAL_SRC_FILES :=	\
-	ARMTargetInfo.cpp
-	
+LOCAL_SRC_FILES := $(arm_target_info_SRC_FILES)
+
+LOCAL_C_INCLUDES +=	\
+	$(LOCAL_PATH)/..
+
+LOCAL_MODULE:= libLLVMARMInfo
+
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_TBLGEN_RULES_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+include $(CLEAR_TBLGEN_VARS)
+
+TBLGEN_TABLES := $(arm_target_info_TBLGEN_TABLES)
+
+TBLGEN_TD_DIR := $(LOCAL_PATH)/..
+
+LOCAL_SRC_FILES := $(arm_target_info_SRC_FILES)
+
 LOCAL_C_INCLUDES +=	\
 	$(LOCAL_PATH)/..