diff options
| author | Igor Murashkin <iam@google.com> | 2014-05-01 17:09:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-01 17:09:30 +0000 |
| commit | f3d6bc43642122c3e6c146ac419746638f705e67 (patch) | |
| tree | b2bde11a3fab32b478674fb171e11efa86620eea /Android.mk | |
| parent | 7daef36cf71b476337dc5179acfdf9432e2cd3aa (diff) | |
| parent | 9a321e192ec745bd03607232da2c537348451cb2 (diff) | |
| download | platform_libnativehelper-idea133-weekly-release.tar.gz platform_libnativehelper-idea133-weekly-release.tar.bz2 platform_libnativehelper-idea133-weekly-release.zip | |
Merge "libnativehelper: Add NDK-only target using libc++"idea133-weekly-release
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 24 |
1 files changed, 23 insertions, 1 deletions
@@ -49,14 +49,36 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libnativehelper_compat LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include/nativehelper +LOCAL_EXPORT_C_INCLUDE_DIRS := \ + $(LOCAL_PATH)/include/nativehelper LOCAL_CFLAGS := -Werror LOCAL_SRC_FILES := $(local_src_files) LOCAL_LDFLAGS := -llog -LOCAL_SDK_VERSION := 17 +LOCAL_SDK_VERSION := 19 LOCAL_NDK_STL_VARIANT := stlport_static LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_SHARED_LIBRARY) +# +# NDK-only build for the target (device), using libc++. +# - Relies only on NDK exposed functionality. +# - This doesn't include JniInvocation. +# + +include $(CLEAR_VARS) +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libnativehelper_compat_libc++ +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/include/nativehelper +LOCAL_EXPORT_C_INCLUDE_DIRS := \ + $(LOCAL_PATH)/include/nativehelper +LOCAL_CFLAGS := -Werror +LOCAL_SRC_FILES := $(local_src_files) +LOCAL_LDFLAGS := -llog -ldl +LOCAL_SDK_VERSION := 19 +LOCAL_NDK_STL_VARIANT := c++_static +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +include $(BUILD_SHARED_LIBRARY) # |