Stop checking HOST_OS, whitelist windows modules

Bug: 23566667
Change-Id: If7a149c047ccd36c7789eda3c29d6cc8977ca6d6

27 files changed, 32 insertions, 73 deletions

diff --git a/lib/Target/AArch64/Android.mk b/lib/Target/AArch64/Android.mk
index f3acd3a9c738..452cffcc4131 100644
--- a/lib/Target/AArch64/Android.mk
+++ b/lib/Target/AArch64/Android.mk
@@ -50,7 +50,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMAArch64CodeGen
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(aarch64_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
@@ -68,7 +68,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMAArch64CodeGen
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(aarch64_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
diff --git a/lib/Target/AArch64/AsmParser/Android.mk b/lib/Target/AArch64/AsmParser/Android.mk
index b7a5e9ee93a7..f86f29f90b79 100644
--- a/lib/Target/AArch64/AsmParser/Android.mk
+++ b/lib/Target/AArch64/AsmParser/Android.mk
@@ -25,7 +25,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMAArch64AsmParser
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(aarch64_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(aarch64_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(aarch64_asm_parser_TBLGEN_TABLES)
@@ -33,13 +33,12 @@ TBLGEN_TD_DIR := $(aarch64_asm_parser_TBLGEN_TD_DIR)
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
-ifneq (,$(filter windows darwin,$(HOST_OS)))
 # Override the default optimization level to work around taking forever (~50m)
 # to compile AArch64AsmParser.cpp on Mac with gcc 4.2,
 # or on Linux with mingw32msvc-gcc 4.2, which is used to cross-compile
 # the win_sdk.
-LOCAL_CFLAGS += -O0
-endif
+LOCAL_CFLAGS_darwin += -O0
+LOCAL_CFLAGS_windows += -O0
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 
@@ -51,7 +50,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMAArch64AsmParser
-LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(aarch64_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(aarch64_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(aarch64_asm_parser_TBLGEN_TABLES)
diff --git a/lib/Target/AArch64/Disassembler/Android.mk b/lib/Target/AArch64/Disassembler/Android.mk
index 53a65b8284bf..05a1489a4e4c 100644
--- a/lib/Target/AArch64/Disassembler/Android.mk
+++ b/lib/Target/AArch64/Disassembler/Android.mk
@@ -26,8 +26,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMAArch64Disassembler
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -48,7 +46,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMAArch64Disassembler
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
diff --git a/lib/Target/AArch64/InstPrinter/Android.mk b/lib/Target/AArch64/InstPrinter/Android.mk
index 51b44151a0bf..7c92f7fb36f4 100644
--- a/lib/Target/AArch64/InstPrinter/Android.mk
+++ b/lib/Target/AArch64/InstPrinter/Android.mk
@@ -26,7 +26,7 @@ LOCAL_MODULE:= libLLVMAArch64AsmPrinter
 LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/..
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
@@ -49,8 +49,6 @@ LOCAL_C_INCLUDES+= \
 
 LOCAL_MODULE:= libLLVMAArch64AsmPrinter
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
diff --git a/lib/Target/AArch64/MCTargetDesc/Android.mk b/lib/Target/AArch64/MCTargetDesc/Android.mk
index a23c0e52567d..895f172c6b34 100644
--- a/lib/Target/AArch64/MCTargetDesc/Android.mk
+++ b/lib/Target/AArch64/MCTargetDesc/Android.mk
@@ -24,7 +24,7 @@ include $(CLEAR_TBLGEN_VARS)
 
 
 LOCAL_MODULE:= libLLVMAArch64Desc
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(aarch64_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
@@ -44,7 +44,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMAArch64Desc
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(aarch64_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
diff --git a/lib/Target/AArch64/TargetInfo/Android.mk b/lib/Target/AArch64/TargetInfo/Android.mk
index 677f8602a293..6a963edcc46d 100644
--- a/lib/Target/AArch64/TargetInfo/Android.mk
+++ b/lib/Target/AArch64/TargetInfo/Android.mk
@@ -24,7 +24,7 @@ LOCAL_C_INCLUDES +=	\
 
 LOCAL_MODULE:= libLLVMAArch64Info
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
@@ -47,8 +47,6 @@ LOCAL_C_INCLUDES +=	\
 
 LOCAL_MODULE:= libLLVMAArch64Info
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
diff --git a/lib/Target/AArch64/Utils/Android.mk b/lib/Target/AArch64/Utils/Android.mk
index a3614fa5e5a6..a76f46cb0dd1 100644
--- a/lib/Target/AArch64/Utils/Android.mk
+++ b/lib/Target/AArch64/Utils/Android.mk
@@ -19,8 +19,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMAArch64Utils
 
-LOCAL_MODULE_TAGS := optional
-
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 TBLGEN_TABLES := $(aarch64_utils_TBLGEN_TABLES)
 
@@ -40,7 +38,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMAArch64Utils
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 TBLGEN_TABLES := $(aarch64_utils_TBLGEN_TABLES)
diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index a741f10e7e08..327bb1075bb4 100644
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -52,7 +52,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMARMCodeGen
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(arm_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
@@ -70,7 +70,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMARMCodeGen
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(arm_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
diff --git a/lib/Target/ARM/AsmParser/Android.mk b/lib/Target/ARM/AsmParser/Android.mk
index 5f88cc3f3b16..42c36e9541df 100644
--- a/lib/Target/ARM/AsmParser/Android.mk
+++ b/lib/Target/ARM/AsmParser/Android.mk
@@ -25,7 +25,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMARMAsmParser
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(arm_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(arm_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(arm_asm_parser_TBLGEN_TABLES)
@@ -33,13 +33,12 @@ TBLGEN_TD_DIR := $(arm_asm_parser_TBLGEN_TD_DIR)
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
-ifneq (,$(filter windows darwin,$(HOST_OS)))
 # Override the default optimization level to work around taking forever (~50m)
 # to compile ARMAsmParser.cpp on Mac with gcc 4.2,
 # or on Linux with mingw32msvc-gcc 4.2, which is used to cross-compile
 # the win_sdk.
-LOCAL_CFLAGS += -O0
-endif
+LOCAL_CFLAGS_darwin += -O0
+LOCAL_CFLAGS_windows += -O0
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 
@@ -51,7 +50,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMARMAsmParser
-LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(arm_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(arm_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(arm_asm_parser_TBLGEN_TABLES)
diff --git a/lib/Target/ARM/Disassembler/Android.mk b/lib/Target/ARM/Disassembler/Android.mk
index 3db61a5c8569..e849a6920908 100644
--- a/lib/Target/ARM/Disassembler/Android.mk
+++ b/lib/Target/ARM/Disassembler/Android.mk
@@ -25,8 +25,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMARMDisassembler
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -47,7 +45,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMARMDisassembler
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
diff --git a/lib/Target/ARM/InstPrinter/Android.mk b/lib/Target/ARM/InstPrinter/Android.mk
index cefed76521cb..d8ef32ab4ed2 100644
--- a/lib/Target/ARM/InstPrinter/Android.mk
+++ b/lib/Target/ARM/InstPrinter/Android.mk
@@ -25,7 +25,7 @@ LOCAL_MODULE:= libLLVMARMAsmPrinter
 LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/..
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
@@ -48,8 +48,6 @@ LOCAL_C_INCLUDES+= \
 
 LOCAL_MODULE:= libLLVMARMAsmPrinter
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
diff --git a/lib/Target/ARM/MCTargetDesc/Android.mk b/lib/Target/ARM/MCTargetDesc/Android.mk
index a5827f7e0bc2..98a12d61d991 100644
--- a/lib/Target/ARM/MCTargetDesc/Android.mk
+++ b/lib/Target/ARM/MCTargetDesc/Android.mk
@@ -28,7 +28,7 @@ include $(CLEAR_TBLGEN_VARS)
 
 
 LOCAL_MODULE:= libLLVMARMDesc
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(arm_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
diff --git a/lib/Target/ARM/TargetInfo/Android.mk b/lib/Target/ARM/TargetInfo/Android.mk
index e31c2b83231a..6b5c473e7905 100644
--- a/lib/Target/ARM/TargetInfo/Android.mk
+++ b/lib/Target/ARM/TargetInfo/Android.mk
@@ -24,7 +24,7 @@ LOCAL_C_INCLUDES +=	\
 
 LOCAL_MODULE:= libLLVMARMInfo
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
@@ -47,8 +47,6 @@ LOCAL_C_INCLUDES +=	\
 
 LOCAL_MODULE:= libLLVMARMInfo
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
diff --git a/lib/Target/Android.mk b/lib/Target/Android.mk
index 71051bb92ab7..81f1aa2257a6 100644
--- a/lib/Target/Android.mk
+++ b/lib/Target/Android.mk
@@ -17,7 +17,7 @@ LOCAL_SRC_FILES := $(target_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMTarget
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -32,8 +32,6 @@ LOCAL_SRC_FILES := $(target_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMTarget
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk
index 235e788f1520..e884031684bd 100644
--- a/lib/Target/Mips/Android.mk
+++ b/lib/Target/Mips/Android.mk
@@ -53,7 +53,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsCodeGen
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(mips_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
@@ -72,7 +72,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsCodeGen
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(mips_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
diff --git a/lib/Target/Mips/AsmParser/Android.mk b/lib/Target/Mips/AsmParser/Android.mk
index 7d8eec197572..8cbb16c77052 100644
--- a/lib/Target/Mips/AsmParser/Android.mk
+++ b/lib/Target/Mips/AsmParser/Android.mk
@@ -25,7 +25,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsAsmParser
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(mips_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(mips_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(mips_asm_parser_TBLGEN_TABLES)
@@ -44,7 +44,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsAsmParser
-LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(mips_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(mips_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(mips_asm_parser_TBLGEN_TABLES)
diff --git a/lib/Target/Mips/Disassembler/Android.mk b/lib/Target/Mips/Disassembler/Android.mk
index 20fd87afb70a..b1f0df52f530 100644
--- a/lib/Target/Mips/Disassembler/Android.mk
+++ b/lib/Target/Mips/Disassembler/Android.mk
@@ -16,7 +16,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsDisassembler
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(mips_disassembler_SRC_FILES)
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
@@ -35,7 +34,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsDisassembler
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(mips_disassembler_SRC_FILES)
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
diff --git a/lib/Target/Mips/InstPrinter/Android.mk b/lib/Target/Mips/InstPrinter/Android.mk
index f4f3a4f00856..fd095fde5d2b 100644
--- a/lib/Target/Mips/InstPrinter/Android.mk
+++ b/lib/Target/Mips/InstPrinter/Android.mk
@@ -15,7 +15,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsAsmPrinter
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 TBLGEN_TABLES := $(mips_asm_printer_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
@@ -34,7 +34,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsAsmPrinter
-LOCAL_MODULE_TAGS := optional
 
 TBLGEN_TABLES := $(mips_asm_printer_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
diff --git a/lib/Target/Mips/MCTargetDesc/Android.mk b/lib/Target/Mips/MCTargetDesc/Android.mk
index 7f462d31c75b..19555cbd167c 100644
--- a/lib/Target/Mips/MCTargetDesc/Android.mk
+++ b/lib/Target/Mips/MCTargetDesc/Android.mk
@@ -26,7 +26,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsDesc
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(mips_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
@@ -46,7 +46,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsDesc
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(mips_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
diff --git a/lib/Target/Mips/TargetInfo/Android.mk b/lib/Target/Mips/TargetInfo/Android.mk
index 173d05b24787..58a54091af7f 100644
--- a/lib/Target/Mips/TargetInfo/Android.mk
+++ b/lib/Target/Mips/TargetInfo/Android.mk
@@ -14,7 +14,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsInfo
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 TBLGEN_TABLES := $(mips_target_info_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
@@ -33,7 +33,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsInfo
-LOCAL_MODULE_TAGS := optional
 
 TBLGEN_TABLES := $(mips_target_info_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
@@ -44,4 +43,4 @@ LOCAL_C_INCLUDES +=	$(LOCAL_PATH)/..
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
-endif
\ No newline at end of file
+endif
diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index d946b98d4d5d..232a94061889 100644
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -46,7 +46,7 @@ LOCAL_SRC_FILES := $(x86_codegen_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMX86CodeGen
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
@@ -65,8 +65,6 @@ LOCAL_SRC_FILES := $(x86_codegen_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMX86CodeGen
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
diff --git a/lib/Target/X86/AsmParser/Android.mk b/lib/Target/X86/AsmParser/Android.mk
index 4235cb171700..fcbbc42a83c4 100644
--- a/lib/Target/X86/AsmParser/Android.mk
+++ b/lib/Target/X86/AsmParser/Android.mk
@@ -28,7 +28,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMX86AsmParser
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(x86_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(x86_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(x86_asm_parser_TBLGEN_TABLES)
@@ -47,7 +47,6 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMX86AsmParser
-LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(x86_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(x86_asm_parser_C_INCLUDES)
 TBLGEN_TABLES := $(x86_asm_parser_TBLGEN_TABLES)
diff --git a/lib/Target/X86/Disassembler/Android.mk b/lib/Target/X86/Disassembler/Android.mk
index 0b3b8a5f9165..7b4bbc8c55d0 100644
--- a/lib/Target/X86/Disassembler/Android.mk
+++ b/lib/Target/X86/Disassembler/Android.mk
@@ -27,8 +27,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMX86Disassembler
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -50,7 +48,7 @@ LOCAL_C_INCLUDES +=	\
 
 LOCAL_MODULE:= libLLVMX86Disassembler
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
diff --git a/lib/Target/X86/InstPrinter/Android.mk b/lib/Target/X86/InstPrinter/Android.mk
index 9881bebf2cb0..13288cf4f0e5 100644
--- a/lib/Target/X86/InstPrinter/Android.mk
+++ b/lib/Target/X86/InstPrinter/Android.mk
@@ -28,8 +28,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMX86AsmPrinter
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -50,7 +48,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE := libLLVMX86AsmPrinter
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
diff --git a/lib/Target/X86/MCTargetDesc/Android.mk b/lib/Target/X86/MCTargetDesc/Android.mk
index a3c9bc8d7ecc..59dd2812181d 100644
--- a/lib/Target/X86/MCTargetDesc/Android.mk
+++ b/lib/Target/X86/MCTargetDesc/Android.mk
@@ -23,7 +23,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMX86Desc
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(x86_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
@@ -43,7 +43,6 @@ include $(CLEAR_TBLGEN_VARS)
 
 
 LOCAL_MODULE:= libLLVMX86Desc
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(x86_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
diff --git a/lib/Target/X86/TargetInfo/Android.mk b/lib/Target/X86/TargetInfo/Android.mk
index 1a6c9021759f..e3b6e2b055be 100644
--- a/lib/Target/X86/TargetInfo/Android.mk
+++ b/lib/Target/X86/TargetInfo/Android.mk
@@ -24,7 +24,7 @@ LOCAL_C_INCLUDES +=	\
 
 LOCAL_MODULE:= libLLVMX86Info
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
@@ -47,8 +47,6 @@ LOCAL_C_INCLUDES +=     \
 
 LOCAL_MODULE:= libLLVMX86Info
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
diff --git a/lib/Target/X86/Utils/Android.mk b/lib/Target/X86/Utils/Android.mk
index e0c47974b688..ad16c16f2736 100644
--- a/lib/Target/X86/Utils/Android.mk
+++ b/lib/Target/X86/Utils/Android.mk
@@ -14,8 +14,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMX86Utils
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
@@ -30,7 +28,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 LOCAL_MODULE:= libLLVMX86Utils
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)