diff options
| author | Ying Wang <wangying@google.com> | 2012-08-14 10:13:16 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-08-14 10:16:02 -0700 |
| commit | 848020f22a5e305ddf8814942e71d8120509a4ec (patch) | |
| tree | 5d34a0c9b0bb014494255ffaba68273336a72fec /core/package.mk | |
| parent | 4000ff56111a994479663ad5895b70f92a4fc3ed (diff) | |
| download | build-848020f22a5e305ddf8814942e71d8120509a4ec.zip build-848020f22a5e305ddf8814942e71d8120509a4ec.tar.gz build-848020f22a5e305ddf8814942e71d8120509a4ec.tar.bz2 | |
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
Diffstat (limited to 'core/package.mk')
| -rw-r--r-- | core/package.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/package.mk b/core/package.mk index fac9549..7b10c33 100644 --- a/core/package.mk +++ b/core/package.mk @@ -299,12 +299,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. |