StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make linking with libcompiler_rt conditional" am: 340c0c5701

Browse Source 
am: 74e4a83d47

Change-Id: I03633ef4d5bae7c117ef133e40cf4c0ce57d088b
This commit is contained in:
Alexey Polyudov
2016-08-02 22:19:59 +00:00
committed by android-build-merger
parent 7a646707fe 74e4a83d47
commit ee1f0d0899
2 changed files with 3 additions and 0 deletions
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 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

@@ -145,6 +145,7 @@ LOCAL_PROTOC_FLAGS:=
LOCAL_PROTO_JAVA_OUTPUT_PARAMS:= LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=
LOCAL_VTSC_FLAGS:= LOCAL_VTSC_FLAGS:=
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:=