Merge "Fix Windows SDK build to not use clang."

This commit is contained in:
Tim Murray
2014-07-24 22:08:41 +00:00
committed by Gerrit Code Review

View File

@@ -133,10 +133,12 @@ endif
# clang is enabled by default for host builds
# enable it unless we've specifically disabled clang above
ifdef LOCAL_IS_HOST_MODULE
ifneq($(HOST_OS),windows)
ifeq ($(my_clang),)
my_clang := true
endif
endif
endif
# arch-specific static libraries go first so that generic ones can depend on them
my_static_libraries := $(LOCAL_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_static_libraries)