commit a529cebde857380adec4d14d4779b405666f7599
author Miao Wang <miaowang@google.com> Thu Mar 31 22:25:09 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 31 22:25:10 2016 +0000
tree c986affd105251e3e11f96aed07cf2fed3e79f0f
parent 8d3311f50dd36312918bd94872a856b99db671fa
parent 57ef7ea4901bf4a7c89a078b1c859310abf1d79c

Merge "[RenderScript] Update the build rules for x86_64 support lib." into nyc-dev

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index d25b323..b7e518f 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -861,7 +861,8 @@
 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