diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-17 19:35:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-17 19:35:16 +0000 |
| commit | 97dff702b35992d4df2b6e479de857c57835da54 (patch) | |
| tree | 2a0cc0ef6466811ac29fe474da890ca15eb9b7fc | |
| parent | 26617dd4be8ba02b95833d41a7414fec49b6b8bb (diff) | |
| parent | ed167265f31b3eac9288a28a7d9b1988b85367e5 (diff) | |
| download | libnfc-nci-97dff702b35992d4df2b6e479de857c57835da54.tar.gz | |
Merge "Move libnfc-nci to libc++."android-wear-5.0.0_r1lollipop-wear-release
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -26,7 +26,6 @@ LOCAL_ARM_MODE := arm 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 @@ LOCAL_SRC_FILES := $(call all-c-files-under, $(HALIMPL)) \ 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 \ |