From 9a321e192ec745bd03607232da2c537348451cb2 Mon Sep 17 00:00:00 2001
From: Sam Hasinoff <hasinoff@google.com>
Date: Thu, 24 Apr 2014 17:52:07 -0700
Subject: libnativehelper: Add NDK-only target using libc++

Change-Id: I5f95fedfe64b465c8be1e02c482a2817740410a6
---
 Android.mk | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

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)
 
 
 #
-- 
cgit v1.2.3