diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-03-04 17:11:52 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-03-17 20:30:45 +0800 |
| commit | 73d800e5199844d2868288c30a496de1cea0c159 (patch) | |
| tree | 329032bd905ce9180bcbeade30c794233e7a987f /core/package_internal.mk | |
| parent | 1cda15d3234a502ba7332b56a7bbecca228731cf (diff) | |
| download | build-73d800e5199844d2868288c30a496de1cea0c159.zip build-73d800e5199844d2868288c30a496de1cea0c159.tar.gz build-73d800e5199844d2868288c30a496de1cea0c159.tar.bz2 | |
Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
Add llvm libc++ static and shared libraries
Change-Id: I92af9b6ab21cbf8ea82e014a4c11aeb5455920f9
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 65c35cc..60553bd 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -318,13 +318,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. |