diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-03-18 00:09:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-18 00:09:13 +0000 |
| commit | 66a4ef8f754b73f3e45d5b87a09fcc3655cda7f3 (patch) | |
| tree | 2580014645df0fc7786ea453867050bcbea8f4f9 /core/package_internal.mk | |
| parent | ce4187832a7825efccae13b69ed5499608a66a13 (diff) | |
| parent | d14f3cc7bc9983ea5ba1c2d952d2b5f51935f42c (diff) | |
| download | build-66a4ef8f754b73f3e45d5b87a09fcc3655cda7f3.zip build-66a4ef8f754b73f3e45d5b87a09fcc3655cda7f3.tar.gz build-66a4ef8f754b73f3e45d5b87a09fcc3655cda7f3.tar.bz2 | |
am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
* commit 'd14f3cc7bc9983ea5ba1c2d952d2b5f51935f42c':
Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
Diffstat (limited to 'core/package_internal.mk')
| -rw-r--r-- | core/package_internal.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index 7201d4b..9f8c35d 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -315,13 +315,20 @@ endif # App explicitly requires the prebuilt NDK libstlport_shared.so. # 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)) +ifneq ($(filter $(LOCAL_NDK_STL_VARIANT), stlport_shared c++_shared),) 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 +endif +ifeq (stlport_shared,$(LOCAL_NDK_STL_VARIANT)) jni_shared_libraries += \ $(HISTORICAL_NDK_VERSIONS_ROOT)/current/sources/cxx-stl/stlport/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libstlport_shared.so +else +ifeq (c++_shared,$(LOCAL_NDK_STL_VARIANT)) +jni_shared_libraries += \ + $(HISTORICAL_NDK_VERSIONS_ROOT)/current/sources/cxx-stl/llvm-libc++/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libc++_shared.so +endif endif # Set the abi directory used by the local JNI shared libraries. |