From 4121aa9bb8353f8e95ab6364f04d7f10080dfcb5 Mon Sep 17 00:00:00 2001 From: Miao Wang Date: Wed, 30 Mar 2016 13:29:42 -0700 Subject: [PATCH] [RenderScript] Update the build rules for x86_64 support lib. Bug: 19735423 - Unlike other archs, x86_64 has both usr/lib and usr/lib64. we need to search for libm.so and libc.so in lib64/. Otherwise the linker will report error. Change-Id: I2859bee066a9eb100828d90da8adf0f9817d77e6 (cherry picked from commit 57ef7ea4901bf4a7c89a078b1c859310abf1d79c) --- core/config.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/config.mk b/core/config.mk index e68673367..072f481b8 100644 --- a/core/config.mk +++ b/core/config.mk @@ -853,7 +853,8 @@ endif RS_PREBUILT_CLCORE := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/librsrt_$(TARGET_ARCH).bc RS_PREBUILT_COMPILER_RT := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/libcompiler_rt.a ifeq (true,$(TARGET_IS_64_BIT)) -RS_PREBUILT_LIBPATH := -L prebuilts/ndk/current/platforms/android-21/arch-$(TARGET_ARCH)/usr/lib +RS_PREBUILT_LIBPATH := -L prebuilts/ndk/current/platforms/android-21/arch-$(TARGET_ARCH)/usr/lib64 \ + -L prebuilts/ndk/current/platforms/android-21/arch-$(TARGET_ARCH)/usr/lib else RS_PREBUILT_LIBPATH := -L prebuilts/ndk/current/platforms/android-9/arch-$(TARGET_ARCH)/usr/lib endif