From 54fdb473b656544c75ad06497ecf20a1e8d6b539 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 14 Aug 2012 10:13:16 -0700 Subject: Retire LOCAL_NDK_VERSION. We are now unifying the NDK versions of unbundled native code to always use the latest NDK. We don't need the variable LOCAL_NDK_VERSION now. To build native code with NDK, you need set just LOCAL_SDK_VERSION. Bug: 6932421 Change-Id: I86f05a264249cda6bae97b4b1616f03700cd9dfa --- core/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/package.mk') diff --git a/core/package.mk b/core/package.mk index 50b9f7a..a1d901e 100644 --- a/core/package.mk +++ b/core/package.mk @@ -307,12 +307,12 @@ jni_shared_libraries := \ # libstlport_shared.so should never go to the system image. # Instead it should be packaged into the apk. ifeq (stlport_shared,$(LOCAL_NDK_STL_VARIANT)) -ifndef LOCAL_NDK_VERSION -$(error LOCAL_NDK_VERSION has to be defined together with LOCAL_NDK_STL_VARIANT, \ +ifndef LOCAL_SDK_VERSION +$(error LOCAL_SDK_VERSION has to be defined together with LOCAL_NDK_STL_VARIANT, \ LOCAL_PACKAGE_NAME=$(LOCAL_PACKAGE_NAME)) endif jni_shared_libraries += \ - $(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources/cxx-stl/stlport/libs/$(TARGET_CPU_ABI)/libstlport_shared.so + $(HISTORICAL_NDK_VERSIONS_ROOT)/current/sources/cxx-stl/stlport/libs/$(TARGET_CPU_ABI)/libstlport_shared.so endif # Set the abi directory used by the local JNI shared libraries. -- cgit v1.1