p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Make linking with libcompiler_rt conditional"

This commit is contained in:
Alexey Polyudov 2016-08-02 22:03:48 +00:00 committed by Gerrit Code Review
parent 7a16eb05cc ee27d813b9
commit 340c0c5701
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/binary.mk
View File

@ -343,10 +343,12 @@ endif
include $(BUILD_SYSTEM)/config_sanitizers.mk include $(BUILD_SYSTEM)/config_sanitizers.mk
ifneq ($(LOCAL_NO_LIBCOMPILER_RT),true)
# Add in libcompiler_rt for all regular device builds # Add in libcompiler_rt for all regular device builds
ifeq (,$(LOCAL_SDK_VERSION)$(WITHOUT_LIBCOMPILER_RT)) ifeq (,$(LOCAL_SDK_VERSION)$(WITHOUT_LIBCOMPILER_RT))
my_static_libraries += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES) my_static_libraries += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)
endif endif
endif
#################################################### ####################################################
## Add FDO flags if FDO is turned on and supported ## Add FDO flags if FDO is turned on and supported

1
core/clear_vars.mk
View File

@ -142,6 +142,7 @@ LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full,nanopb-c,nanopb-c-e
LOCAL_PROTOC_FLAGS:= LOCAL_PROTOC_FLAGS:=
LOCAL_PROTO_JAVA_OUTPUT_PARAMS:= LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=
LOCAL_NO_CRT:= LOCAL_NO_CRT:=
LOCAL_NO_LIBCOMPILER_RT:=
LOCAL_NO_LIBGCC:= LOCAL_NO_LIBGCC:=
LOCAL_NO_PIC:= LOCAL_NO_PIC:=
LOCAL_PROPRIETARY_MODULE:= LOCAL_PROPRIETARY_MODULE:=