commit 7f8d0ba6bd4b23295bbddda47e85a69b15922dd1
author Ying Wang <wangying@google.com> Fri Aug 10 10:57:37 2012 -0700
committer Ying Wang <wangying@google.com> Tue Aug 14 11:55:46 2012 -0700
tree a9d6781c8377cb700cc76eefbf1d4d98c24bfe40
parent f59a64b7cba7330701b8791698e67abff8afde65

Adopt the new prebuilts/ndk/<number> paths.

Bug: 6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea

core/package.mk

diff --git a/core/package.mk b/core/package.mk
index 3f911fb..50b9f7a 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -312,7 +312,7 @@
     LOCAL_PACKAGE_NAME=$(LOCAL_PACKAGE_NAME))
 endif
 jni_shared_libraries += \
-    $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/sources/cxx-stl/stlport/libs/$(TARGET_CPU_ABI)/libstlport_shared.so
+    $(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources/cxx-stl/stlport/libs/$(TARGET_CPU_ABI)/libstlport_shared.so
 endif
 
 # Set the abi directory used by the local JNI shared libraries.