aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Hasinoff <hasinoff@google.com>2014-04-24 17:52:07 -0700
committerSam Hasinoff <hasinoff@google.com>2014-04-30 12:56:17 -0700
commit9a321e192ec745bd03607232da2c537348451cb2 (patch)
treeb2bde11a3fab32b478674fb171e11efa86620eea
parent7daef36cf71b476337dc5179acfdf9432e2cd3aa (diff)
downloadplatform_libnativehelper-9a321e192ec745bd03607232da2c537348451cb2.tar.gz
platform_libnativehelper-9a321e192ec745bd03607232da2c537348451cb2.tar.bz2
platform_libnativehelper-9a321e192ec745bd03607232da2c537348451cb2.zip
libnativehelper: Add NDK-only target using libc++
Change-Id: I5f95fedfe64b465c8be1e02c482a2817740410a6
-rw-r--r--Android.mk24
1 files changed, 23 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index bd50152..feb2fb3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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)
#