From: Dan Albert <danalbert@google.com>
Date: Wed, 14 Sep 2016 23:08:48 +0000 (-0700)
Subject: Use libcompiler-rt_extras with NDK builds.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c28e4bcb1c;p=android-x86%2Fbuild.git

Use libcompiler-rt_extras with NDK builds.

We want to build things in CTS (things built against the NDK) with
integer overflow checks. Some projects in the tree also make explicit
calls to the overflow checked builtins, and those projects need to be
built with the NDK (external/dng_sdk is the specific example that
brought this up).

Test: make checkbuild tests
Bug: None
Change-Id: Iab27dd0d931f723140de242049fa72f3b1ce0fb8
---

diff --git a/core/binary.mk b/core/binary.mk
index 828dcdb78..058c7e480 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -418,7 +418,7 @@ 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))
+ifeq (,$(WITHOUT_LIBCOMPILER_RT))
   my_static_libraries += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)
 endif
 endif