diff --git a/Android.mk b/Android.mk
index 4a453e2..e2b991d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -65,12 +65,8 @@
 
 LOCAL_CFLAGS += $(local_cflags_for_slang)
 
-ifeq ($(HOST_OS),windows)
 # Skip missing-field-initializer warnings for mingw.
-LOCAL_CFLAGS += -Wno-error=missing-field-initializers
-else
-LOCAL_CLANG := true
-endif
+LOCAL_CFLAGS_windows += -Wno-error=missing-field-initializers
 
 TBLGEN_TABLES :=    \
 	AttrList.inc	\
@@ -93,9 +89,6 @@
 LOCAL_C_INCLUDES += frameworks/compile/libbcc/include
 
 LOCAL_LDLIBS := -ldl -lpthread
-ifneq ($(HOST_OS),windows)
-LOCAL_CXX_STL := libc++
-endif
 
 include $(CLANG_HOST_BUILD_MK)
 include $(CLANG_TBLGEN_RULES_MK)
@@ -133,12 +126,8 @@
 
 LOCAL_CFLAGS += $(local_cflags_for_slang)
 
-ifeq ($(HOST_OS),windows)
 # Skip missing-field-initializer warnings for mingw.
 LOCAL_CFLAGS += -Wno-error=missing-field-initializers
-else
-LOCAL_CLANG := true
-endif
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_MODULE_CLASS := EXECUTABLES
@@ -187,11 +176,9 @@
 	libclang \
 	libLLVM
 
-ifeq ($(HOST_OS),windows)
-  LOCAL_LDLIBS := -limagehlp -lpsapi
-else
-  LOCAL_LDLIBS := -ldl -lpthread
-endif
+LOCAL_LDLIBS_windows := -limagehlp -lpsapi
+LOCAL_LDLIBS_linux := -ldl -lpthread
+LOCAL_LDLIBS_darwin := -ldl -lpthread
 
 # For build RSCCOptions.inc from RSCCOptions.td
 intermediates := $(call local-generated-sources-dir)
diff --git a/BitWriter_2_9/Android.mk b/BitWriter_2_9/Android.mk
index 73c6b8b..37d1e61 100644
--- a/BitWriter_2_9/Android.mk
+++ b/BitWriter_2_9/Android.mk
@@ -19,11 +19,7 @@
 
 LOCAL_MODULE:= libLLVMBitWriter_2_9
 
-LOCAL_MODULE_TAGS := optional
-
-ifneq ($(HOST_OS),windows)
-LOCAL_CLANG := true
-endif
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
diff --git a/BitWriter_2_9_func/Android.mk b/BitWriter_2_9_func/Android.mk
index 3910a91..742eda3 100644
--- a/BitWriter_2_9_func/Android.mk
+++ b/BitWriter_2_9_func/Android.mk
@@ -19,11 +19,7 @@
 
 LOCAL_MODULE:= libLLVMBitWriter_2_9_func
 
-LOCAL_MODULE_TAGS := optional
-
-ifneq ($(HOST_OS),windows)
-LOCAL_CLANG := true
-endif
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
diff --git a/BitWriter_3_2/Android.mk b/BitWriter_3_2/Android.mk
index f0e866b..7a456e2 100644
--- a/BitWriter_3_2/Android.mk
+++ b/BitWriter_3_2/Android.mk
@@ -19,11 +19,7 @@
 
 LOCAL_MODULE:= libLLVMBitWriter_3_2
 
-LOCAL_MODULE_TAGS := optional
-
-ifneq ($(HOST_OS),windows)
-LOCAL_CLANG := true
-endif
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
@@ -40,8 +36,6 @@
 
 LOCAL_MODULE:= libLLVMBitWriter_3_2
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)