Fix llvm.mk and the other 49 mk files

Change-Id: I5aa02363c1083297d163a575f5a35c495f950230

29 files changed, 164 insertions, 19 deletions

diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index 6878b85a3b..e8cca216ac 100644
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 analysis_SRC_FILES :=	\
@@ -68,3 +71,5 @@ LOCAL_MODULE:= libLLVMAnalysis
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Analysis/IPA/Android.mk b/lib/Analysis/IPA/Android.mk
index 6d15e52293..d445a1b1e6 100644
--- a/lib/Analysis/IPA/Android.mk
+++ b/lib/Analysis/IPA/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 analysis_ipa_SRC_FILES :=	\
@@ -29,3 +32,5 @@ LOCAL_MODULE:= libLLVMipa
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/AsmParser/Android.mk b/lib/AsmParser/Android.mk
index 548f719ade..d0d647e7ab 100644
--- a/lib/AsmParser/Android.mk
+++ b/lib/AsmParser/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 asm_parser_SRC_FILES :=	\
@@ -26,3 +29,5 @@ LOCAL_MODULE:= libLLVMAsmParser
 
 include $(LOCAL_PATH)/../../llvm-device-build.mk
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Bitcode/Reader/Android.mk b/lib/Bitcode/Reader/Android.mk
index 165b0d0cde..c78b702274 100644
--- a/lib/Bitcode/Reader/Android.mk
+++ b/lib/Bitcode/Reader/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 bitcode_reader_SRC_FILES :=	\
@@ -27,3 +30,5 @@ LOCAL_MODULE:= libLLVMBitReader
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Bitcode/Writer/Android.mk b/lib/Bitcode/Writer/Android.mk
index 5147c4646d..a4aac59a28 100644
--- a/lib/Bitcode/Writer/Android.mk
+++ b/lib/Bitcode/Writer/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 # For the host only
@@ -15,3 +18,5 @@ LOCAL_MODULE:= libLLVMBitWriter
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
+
+endif
diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index d232e551a0..2ce8aecbd6 100644
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 codegen_SRC_FILES :=	\
@@ -99,3 +102,5 @@ LOCAL_MODULE:= libLLVMCodeGen
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/CodeGen/AsmPrinter/Android.mk b/lib/CodeGen/AsmPrinter/Android.mk
index 0063f43b35..159de2ba51 100644
--- a/lib/CodeGen/AsmPrinter/Android.mk
+++ b/lib/CodeGen/AsmPrinter/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH := $(call my-dir)
 
 codegen_asmprinter_SRC_FILES :=	\
@@ -10,11 +13,11 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES :=	\
 	AsmPrinter.cpp	\
 	AsmPrinterDwarf.cpp	\
-   	AsmPrinterInlineAsm.cpp	\
+	AsmPrinterInlineAsm.cpp	\
 	DIE.cpp	\
 	DwarfDebug.cpp	\
 	DwarfException.cpp	\
-	OcamlGCPrinter.cpp  
+	OcamlGCPrinter.cpp
 
 LOCAL_MODULE:= libLLVMAsmPrinter
 
@@ -26,10 +29,12 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES :=	\
-  	AsmPrinter.cpp	\
-   	AsmPrinterInlineAsm.cpp
+	AsmPrinter.cpp	\
+	AsmPrinterInlineAsm.cpp
 
 LOCAL_MODULE:= libLLVMAsmPrinter
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/CodeGen/SelectionDAG/Android.mk b/lib/CodeGen/SelectionDAG/Android.mk
index eb15a1856c..b3665cf13a 100644
--- a/lib/CodeGen/SelectionDAG/Android.mk
+++ b/lib/CodeGen/SelectionDAG/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 codegen_selectiondag_SRC_FILES :=	\
@@ -21,7 +24,7 @@ codegen_selectiondag_SRC_FILES :=	\
 	SelectionDAGBuilder.cpp	\
 	SelectionDAGISel.cpp	\
 	SelectionDAGPrinter.cpp	\
-	TargetLowering.cpp  
+	TargetLowering.cpp
 
 # For the host
 # =====================================================
@@ -46,3 +49,5 @@ LOCAL_MODULE:= libLLVMSelectionDAG
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/ExecutionEngine/JIT/Android.mk b/lib/ExecutionEngine/JIT/Android.mk
index 1c7e27f1b3..3ce2eb4bab 100644
--- a/lib/ExecutionEngine/JIT/Android.mk
+++ b/lib/ExecutionEngine/JIT/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 # For the host
@@ -30,3 +33,5 @@ LOCAL_MODULE:= libLLVMJIT
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/MC/Android.mk b/lib/MC/Android.mk
index a2dc85a9b1..34ec0b08f4 100644
--- a/lib/MC/Android.mk
+++ b/lib/MC/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 mc_SRC_FILES :=	\
@@ -45,3 +48,5 @@ LOCAL_MODULE:= libLLVMMC
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/MC/MCParser/Android.mk b/lib/MC/MCParser/Android.mk
index 1335362be7..9e2d8697b2 100644
--- a/lib/MC/MCParser/Android.mk
+++ b/lib/MC/MCParser/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 mc_parser_SRC_FILES :=	\
@@ -28,3 +31,5 @@ LOCAL_MODULE:= libLLVMMCParser
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk
index e97275381c..f7523d19b2 100644
--- a/lib/Support/Android.mk
+++ b/lib/Support/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 support_SRC_FILES :=	\
@@ -70,3 +73,5 @@ LOCAL_MODULE:= libLLVMSupport
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/System/Android.mk b/lib/System/Android.mk
index c0656c01ba..019ed44585 100644
--- a/lib/System/Android.mk
+++ b/lib/System/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 system_SRC_FILES :=	\
@@ -47,3 +50,5 @@ LOCAL_MODULE:= libLLVMSystem
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index e4d2f68c38..2345b65c3d 100644
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH := $(call my-dir)
 
 arm_codegen_TBLGEN_TABLES :=	\
@@ -68,3 +71,5 @@ include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Target/ARM/AsmParser/Android.mk b/lib/Target/ARM/AsmParser/Android.mk
index 6303fd0275..e28fa400d7 100644
--- a/lib/Target/ARM/AsmParser/Android.mk
+++ b/lib/Target/ARM/AsmParser/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH := $(call my-dir)
 
 # For the device only
@@ -9,14 +12,14 @@ TBLGEN_TABLES :=	\
 	ARMGenInstrNames.inc	\
 	ARMGenRegisterNames.inc	\
 	ARMGenRegisterInfo.h.inc
-   
+
 
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES :=	\
 	ARMAsmLexer.cpp	\
 	ARMAsmParser.cpp
-	
+
 LOCAL_C_INCLUDES +=	\
 	$(LOCAL_PATH)/..
 
@@ -25,3 +28,5 @@ LOCAL_MODULE:= libLLVMARMAsmParser
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Target/ARM/AsmPrinter/Android.mk b/lib/Target/ARM/AsmPrinter/Android.mk
index 727ab1d892..40eddf5830 100644
--- a/lib/Target/ARM/AsmPrinter/Android.mk
+++ b/lib/Target/ARM/AsmPrinter/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH := $(call my-dir)
 
 arm_asm_printer_TBLGEN_TABLES :=	\
@@ -10,7 +13,7 @@ arm_asm_printer_SRC_FILES :=	\
 	ARMAsmPrinter.cpp	\
 	ARMInstPrinter.cpp	\
 	ARMMCInstLower.cpp
-	
+
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
@@ -50,3 +53,5 @@ LOCAL_MODULE:= libLLVMARMAsmPrinter
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Target/ARM/Disassembler/Android.mk b/lib/Target/ARM/Disassembler/Android.mk
index 6aead82dba..4a243e0e02 100644
--- a/lib/Target/ARM/Disassembler/Android.mk
+++ b/lib/Target/ARM/Disassembler/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH := $(call my-dir)
 
 # For the device only
@@ -18,7 +21,7 @@ TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 LOCAL_SRC_FILES :=	\
 	ARMDisassembler.cpp	\
 	ARMDisassemblerCore.cpp
-	
+
 LOCAL_C_INCLUDES +=	\
 	$(LOCAL_PATH)/..
 
@@ -27,3 +30,5 @@ LOCAL_MODULE:= libLLVMARMDisassembler
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Target/ARM/TargetInfo/Android.mk b/lib/Target/ARM/TargetInfo/Android.mk
index 9297d36a40..f594a9d486 100644
--- a/lib/Target/ARM/TargetInfo/Android.mk
+++ b/lib/Target/ARM/TargetInfo/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH := $(call my-dir)
 
 arm_target_info_TBLGEN_TABLES :=	\
@@ -6,7 +9,7 @@ arm_target_info_TBLGEN_TABLES :=	\
 
 arm_target_info_SRC_FILES :=	\
 	ARMTargetInfo.cpp
-	
+
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
@@ -46,3 +49,5 @@ LOCAL_MODULE:= libLLVMARMInfo
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Target/Android.mk b/lib/Target/Android.mk
index 8bf4340a2c..e604e383b6 100644
--- a/lib/Target/Android.mk
+++ b/lib/Target/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 target_SRC_FILES :=	\
@@ -36,3 +39,5 @@ LOCAL_MODULE:= libLLVMTarget
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index 9cff408f10..d86ce5c591 100644
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH := $(call my-dir)
 
 # For the host only
@@ -17,7 +20,7 @@ TBLGEN_TABLES :=	\
 	X86GenFastISel.inc	\
     X86GenCallingConv.inc	\
 	X86GenSubtarget.inc	\
-    X86GenEDInfo.inc  
+    X86GenEDInfo.inc
 
 LOCAL_SRC_FILES :=	\
 	SSEDomainFix.cpp	\
@@ -45,3 +48,5 @@ include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Target/X86/AsmParser/Android.mk b/lib/Target/X86/AsmParser/Android.mk
index c94af7f8c1..6391fb8475 100644
--- a/lib/Target/X86/AsmParser/Android.mk
+++ b/lib/Target/X86/AsmParser/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH := $(call my-dir)
 
 # For the device only
@@ -9,14 +12,14 @@ TBLGEN_TABLES :=	\
 	X86GenAsmMatcher.inc	\
 	X86GenInstrNames.inc	\
 	X86GenRegisterNames.inc
-	
+
 
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES :=	\
 	X86AsmLexer.cpp	\
 	X86AsmParser.cpp
-	
+
 LOCAL_C_INCLUDES +=	\
 	$(LOCAL_PATH)/..
 
@@ -25,3 +28,5 @@ LOCAL_MODULE:= libLLVMX86AsmParser
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Target/X86/AsmPrinter/Android.mk b/lib/Target/X86/AsmPrinter/Android.mk
index 9e4c5e2f84..e5141b4bc7 100644
--- a/lib/Target/X86/AsmPrinter/Android.mk
+++ b/lib/Target/X86/AsmPrinter/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH := $(call my-dir)
 
 # For the device only
@@ -19,7 +22,7 @@ LOCAL_SRC_FILES :=	\
 	X86AsmPrinter.cpp	\
 	X86IntelInstPrinter.cpp	\
 	X86MCInstLower.cpp
-	
+
 LOCAL_C_INCLUDES +=	\
 	$(LOCAL_PATH)/..
 
@@ -28,3 +31,5 @@ LOCAL_MODULE:= libLLVMX86AsmPrinter
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Target/X86/Disassembler/Android.mk b/lib/Target/X86/Disassembler/Android.mk
index 548360b139..029297214e 100644
--- a/lib/Target/X86/Disassembler/Android.mk
+++ b/lib/Target/X86/Disassembler/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH := $(call my-dir)
 
 # For the device only
@@ -9,14 +12,14 @@ TBLGEN_TABLES :=	\
 	X86GenDisassemblerTables.inc	\
 	X86GenEDInfo.inc	\
 	X86GenRegisterNames.inc
-	
+
 
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES :=	\
 	X86Disassembler.cpp	\
 	X86DisassemblerDecoder.c
-	
+
 LOCAL_C_INCLUDES +=	\
 	$(LOCAL_PATH)/..
 
@@ -25,3 +28,5 @@ LOCAL_MODULE:= libLLVMX86Disassembler
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Target/X86/TargetInfo/Android.mk b/lib/Target/X86/TargetInfo/Android.mk
index ee53f0dec9..7a3e672403 100644
--- a/lib/Target/X86/TargetInfo/Android.mk
+++ b/lib/Target/X86/TargetInfo/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH := $(call my-dir)
 
 # For the device only
@@ -13,7 +16,7 @@ TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES :=	\
 	X86TargetInfo.cpp
-	
+
 LOCAL_C_INCLUDES +=	\
 	$(LOCAL_PATH)/..
 
@@ -22,3 +25,5 @@ LOCAL_MODULE:= libLLVMX86Info
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Transforms/IPO/Android.mk b/lib/Transforms/IPO/Android.mk
index c5d4b976d2..06c3f0aadb 100644
--- a/lib/Transforms/IPO/Android.mk
+++ b/lib/Transforms/IPO/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 transforms_ipo_SRC_FILES :=	\
@@ -46,3 +49,5 @@ LOCAL_MODULE:= libLLVMipo
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Transforms/InstCombine/Android.mk b/lib/Transforms/InstCombine/Android.mk
index 07825031cc..54c49ad4a3 100644
--- a/lib/Transforms/InstCombine/Android.mk
+++ b/lib/Transforms/InstCombine/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 transforms_inst_combine_SRC_FILES :=	\
@@ -36,3 +39,5 @@ LOCAL_MODULE:= libLLVMInstCombine
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Transforms/Scalar/Android.mk b/lib/Transforms/Scalar/Android.mk
index 80523eeb42..c4e1f0b293 100644
--- a/lib/Transforms/Scalar/Android.mk
+++ b/lib/Transforms/Scalar/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 transforms_scalar_SRC_FILES :=	\
@@ -35,7 +38,7 @@ transforms_scalar_SRC_FILES :=	\
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(transforms_scalar_SRC_FILES) 
+LOCAL_SRC_FILES := $(transforms_scalar_SRC_FILES)
 LOCAL_MODULE:= libLLVMScalarOpts
 
 include $(LLVM_HOST_BUILD_MK)
@@ -46,9 +49,11 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(transforms_scalar_SRC_FILES) 
+LOCAL_SRC_FILES := $(transforms_scalar_SRC_FILES)
 LOCAL_MODULE:= libLLVMScalarOpts
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/Transforms/Utils/Android.mk b/lib/Transforms/Utils/Android.mk
index 9fba091355..6f02fff33b 100644
--- a/lib/Transforms/Utils/Android.mk
+++ b/lib/Transforms/Utils/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 transforms_utils_SRC_FILES :=	\
@@ -48,3 +51,5 @@ LOCAL_MODULE:= libLLVMTransformUtils
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/lib/VMCore/Android.mk b/lib/VMCore/Android.mk
index 8d35cc5b15..299588b1f2 100644
--- a/lib/VMCore/Android.mk
+++ b/lib/VMCore/Android.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_PATH:= $(call my-dir)
 
 vmcore_SRC_FILES :=	\
@@ -61,3 +64,5 @@ LOCAL_MODULE:= libLLVMCore
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif