commit 4956e12a3fbe9769eccd0ba039b14e80af06470d
author Dan Willemsen <dwillemsen@google.com> Fri Sep 04 19:49:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 04 19:49:08 2015 +0000
tree 4f53344d9daf3db11243f6dce6b50a0e7deb98a6
parent 53d6fdd8b43ad5e48ee1c5921c4a18a11cd2d0b0
parent 60c6100473658bc5978f760a8ef3a549fb539d7a

am 60c61004: am e7154be8: Merge "Remove last HOST_OS check"

* commit '60c6100473658bc5978f760a8ef3a549fb539d7a':
  Remove last HOST_OS check

shared_clang.mk

diff --git a/shared_clang.mk b/shared_clang.mk
index 8b81d16..2580e07 100644
--- a/shared_clang.mk
+++ b/shared_clang.mk
@@ -46,16 +46,11 @@
 # have prebuilts for windows.
 ifneq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
 LOCAL_MODULE_HOST_OS := windows
-# BUILD_HOST_SHARED_LIBRARY can be moved out once
-# LOCAL_MODULE_HOST_OS is enforced.
-ifeq ($(HOST_OS),windows)
-include $(BUILD_HOST_SHARED_LIBRARY)
-endif
 else
 LOCAL_MODULE_HOST_OS := darwin linux windows
-include $(BUILD_HOST_SHARED_LIBRARY)
 endif
 
+include $(BUILD_HOST_SHARED_LIBRARY)
 
 # Don't build the library unless forced to.
 ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS))