commit ee27d813b95a6af835896f9c7d18d0e11c536a53
author Alexey Polyudov <apolyudov@google.com> Mon Aug 01 17:38:35 2016 -0700
committer Alexey Polyudov <apolyudov@google.com> Mon Aug 01 17:38:53 2016 -0700
tree 81881ceb0e5efff328a36dcfd96088299b1d4041
parent 7d6b3f1595768579e0ebe666ced26f968947dc6f

Make linking with libcompiler_rt conditional

introduce LOCAL_NO_LIBCOMPILER_RT
embedded targets do not necessarily want to have it

Bug: 29635686
Change-Id: Ieb04f7ea7237ae01a067dedfa2fb13571e9a789c
Signed-off-by: Alexey Polyudov <apolyudov@google.com>

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 439235b..45f7277 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -343,10 +343,12 @@
 
 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

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 6f5633c..2c64d2e 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -142,6 +142,7 @@
 LOCAL_PROTOC_FLAGS:=
 LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=
 LOCAL_NO_CRT:=
+LOCAL_NO_LIBCOMPILER_RT:=
 LOCAL_NO_LIBGCC:=
 LOCAL_NO_PIC:=
 LOCAL_PROPRIETARY_MODULE:=