Merge "Add support for WITHOUT_CLANG"

This commit is contained in:
Ying Wang
2013-09-16 20:38:28 +00:00
committed by Gerrit Code Review

View File

@@ -98,6 +98,10 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true)
LOCAL_STATIC_LIBRARIES += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)
endif
ifeq ($(strip $(WITHOUT_CLANG)),true)
LOCAL_CLANG :=
endif
# Add in libcompiler_rt for all regular device builds
ifeq (,$(LOCAL_SDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(WITHOUT_LIBCOMPILER_RT))
LOCAL_STATIC_LIBRARIES += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)