diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-26 20:38:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-26 20:38:05 +0000 |
| commit | efd44c45f6f9cd3eb1735d6b798d2cc7913eb515 (patch) | |
| tree | ad293d034fef0f82b1956941e8dd6b6a2b7a7b4c | |
| parent | 46abb3dcf960058e48d1444b6a11cc7e84912339 (diff) | |
| parent | 027cc5774954aa2839f564823ec58f6fcf92d09a (diff) | |
| download | libnfc-nci-efd44c45f6f9cd3eb1735d6b798d2cc7913eb515.tar.gz | |
Merge "Don't manually link stlport."
| -rw-r--r-- | Android.mk | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -20,13 +20,15 @@ D_CFLAGS := -DANDROID -DBUILDCFG=1 # Build shared library system/lib/libnfc-nci.so for stack code. include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_PRELINK_MODULE := false LOCAL_ARM_MODE := arm LOCAL_MODULE := libnfc-nci LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES := libhardware_legacy libcutils liblog libdl libstlport libhardware +LOCAL_SHARED_LIBRARIES := libhardware_legacy libcutils liblog libdl libhardware +LOCAL_CXX_STL := stlport LOCAL_CFLAGS := $(D_CFLAGS) -LOCAL_C_INCLUDES := external/stlport/stlport bionic/ bionic/libstdc++/include \ +LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src/include \ $(LOCAL_PATH)/src/gki/ulinux \ $(LOCAL_PATH)/src/gki/common \ @@ -52,15 +54,17 @@ include $(BUILD_SHARED_LIBRARY) # Android's generic HAL (libhardware.so) dynamically loads this shared library. include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE := nfc_nci.$(TARGET_DEVICE) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := $(call all-c-files-under, $(HALIMPL)) \ $(call all-cpp-files-under, $(HALIMPL)) \ src/adaptation/CrcChecksum.cpp \ src//nfca_version.c -LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware_legacy libstlport +LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware_legacy +LOCAL_CXX_STL := stlport LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := external/stlport/stlport bionic/ bionic/libstdc++/include \ +LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/$(HALIMPL)/include \ $(LOCAL_PATH)/$(HALIMPL)/gki/ulinux \ $(LOCAL_PATH)/$(HALIMPL)/gki/common \ |