commit cdaaba6d6e3e397dbfa6f74a5eaf87ffe2bdbfde
author Dan Albert <danalbert@google.com> Mon Nov 17 19:52:49 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 17 19:52:49 2014 +0000
tree 2a0cc0ef6466811ac29fe474da890ca15eb9b7fc
parent d495bbdd960d62c3393ae4eea0d7096727fe063e
parent 97dff702b35992d4df2b6e479de857c57835da54

am 97dff702: Merge "Move libnfc-nci to libc++."

* commit '97dff702b35992d4df2b6e479de857c57835da54':
  Move libnfc-nci to libc++.

Android.mk

diff --git a/Android.mk b/Android.mk
index 153dc31..4a56381 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,6 @@
 LOCAL_MODULE := libnfc-nci
 LOCAL_MODULE_TAGS := optional
 LOCAL_SHARED_LIBRARIES := libhardware_legacy libcutils liblog libdl libhardware
-LOCAL_CXX_STL := stlport
 LOCAL_CFLAGS := $(D_CFLAGS)
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/src/include \
@@ -64,7 +63,6 @@
     src/adaptation/CrcChecksum.cpp \
     src//nfca_version.c
 LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware_legacy
-LOCAL_CXX_STL := stlport
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/$(HALIMPL)/include \