Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 340c0c57 authored Aug 02, 2016 by Alexey Polyudov Committed by Gerrit Code Review Aug 02, 2016

Merge "Make linking with libcompiler_rt conditional"

parents 7a16eb05 ee27d813

core/binary.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -343,10 +343,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

core/clear_vars.mk

+1 −0

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