tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am a85afdb8: Merge "Add support for WITHOUT_CLANG"

Browse source 
* commit 'a85afdb83d4d9d0fb03024eee9937b0882dd81ad':
  Add support for WITHOUT_CLANG
This commit is contained in:
Ying Wang 2013-09-16 13:40:49 -07:00 committed by Android Git Automerger
commit 7d153833d8
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/binary.mk
View file

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