commit 9073a5d9a51020c0bbbb11c1f5c1b519ecfc544f
author Stephen Hines <srhines@google.com> Thu Oct 01 05:19:50 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 01 05:19:50 2015 +0000
tree 341dda90509a19d3cae0851aac4f889f1ff47aa6
parent 2124d7e1e2dec91ce4ab15c6a215d61f7693a8d6
parent d11c18a4b0c7093d3b6253fedc23566f495e7ed0

Merge "Fix RS NDK usage so we always pull from "current" instead of NDK 8."

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 0a01f41..0b1c020 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -708,7 +708,7 @@
 # Set up RS prebuilt variables for compatibility library
 
 RS_PREBUILT_CLCORE := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/librsrt_$(TARGET_ARCH).bc
-RS_PREBUILT_LIBPATH := -L prebuilts/ndk/8/platforms/android-9/arch-$(TARGET_ARCH)/usr/lib
+RS_PREBUILT_LIBPATH := -L prebuilts/ndk/current/platforms/android-9/arch-$(TARGET_ARCH)/usr/lib
 RS_PREBUILT_COMPILER_RT := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/libcompiler_rt.a
 
 # API Level lists for Renderscript Compat lib.