diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-12 20:09:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 20:09:08 +0000 |
| commit | b4ff72f970b545973fb894eb27be210066361a6f (patch) | |
| tree | 59d9087eceff99c23d2b4d184d2fa8e44cd56042 /nci | |
| parent | edfadf4a6fcb14493b124e6bde930fdfbb7c56a5 (diff) | |
| parent | 512698ea7ac406f7e8a0895e80f74a61bfa13f3b (diff) | |
| download | android_packages_apps_Nfc-b4ff72f970b545973fb894eb27be210066361a6f.tar.gz android_packages_apps_Nfc-b4ff72f970b545973fb894eb27be210066361a6f.tar.bz2 android_packages_apps_Nfc-b4ff72f970b545973fb894eb27be210066361a6f.zip | |
am 512698ea: Merge "Remove makefile cruft."
* commit '512698ea7ac406f7e8a0895e80f74a61bfa13f3b':
Remove makefile cruft.
Diffstat (limited to 'nci')
| -rw-r--r-- | nci/jni/Android.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nci/jni/Android.mk b/nci/jni/Android.mk index 8d65bfc2..a0f3f244 100644 --- a/nci/jni/Android.mk +++ b/nci/jni/Android.mk @@ -4,6 +4,8 @@ NFC := $(VOB_COMPONENTS)/nfc LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + LOCAL_PRELINK_MODULE := false ifneq ($(NCI_VERSION),) @@ -22,11 +24,8 @@ endef LOCAL_SRC_FILES:= $(call all-cpp-files-under, .) LOCAL_C_INCLUDES += \ - bionic \ - bionic/libstdc++ \ external/icu/icu4c/source/common \ external/libxml2/include \ - external/stlport/stlport \ frameworks/native/include \ libcore/include \ $(NFA)/include \ @@ -47,11 +46,11 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ liblog \ libnfc-nci \ - libstlport LOCAL_STATIC_LIBRARIES := libxml2 LOCAL_MODULE := libnfc_nci_jni LOCAL_MODULE_TAGS := optional +include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) |