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" 

am: 340c0c5701

Change-Id: Ide7cf834a0d981671f517366f7308c58d2a79163
This commit is contained in:
Alexey Polyudov 2016-08-02 22:17:24 +00:00 committed by android-build-merger
parent ae817d47dd 340c0c5701
commit 74e4a83d47
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

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

1
core/clear_vars.mk
View File

@ -145,6 +145,7 @@ LOCAL_PROTOC_FLAGS:=
LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=
LOCAL_VTSC_FLAGS:=
LOCAL_NO_CRT:=
LOCAL_NO_LIBCOMPILER_RT:=
LOCAL_NO_LIBGCC:=
LOCAL_NO_PIC:=
LOCAL_PROPRIETARY_MODULE:=