diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-10-14 04:13:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-14 04:13:44 +0000 |
| commit | a590e214ebd1a2aea17ff0758ec080e36348b2c0 (patch) | |
| tree | 8f01f7c5356255863462b07d37c144f33b9dc5b5 | |
| parent | faea766f4cff1dcd3ded4d3294bf6289787eac00 (diff) | |
| parent | e208aeb621783e51b8464232ee515bca2fa0135f (diff) | |
| download | android_packages_apps_Nfc-a590e214ebd1a2aea17ff0758ec080e36348b2c0.tar.gz android_packages_apps_Nfc-a590e214ebd1a2aea17ff0758ec080e36348b2c0.tar.bz2 android_packages_apps_Nfc-a590e214ebd1a2aea17ff0758ec080e36348b2c0.zip | |
am e208aeb6: Use global all-cpp-files-under
* commit 'e208aeb621783e51b8464232ee515bca2fa0135f':
Use global all-cpp-files-under
| -rw-r--r-- | nci/jni/Android.mk | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/nci/jni/Android.mk b/nci/jni/Android.mk index 4f395069..1e33ca63 100644 --- a/nci/jni/Android.mk +++ b/nci/jni/Android.mk @@ -6,23 +6,13 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) include $(call all-makefiles-under,$(LOCAL_PATH)) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - - ifneq ($(NCI_VERSION),) LOCAL_CFLAGS += -DNCI_VERSION=$(NCI_VERSION) -O0 -g endif LOCAL_CFLAGS += -Wall -Wextra -define all-cpp-files-under -$(patsubst ./%,%, \ - $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "*.cpp" -and -not -name ".*") \ - ) -endef - -LOCAL_SRC_FILES = $(call all-cpp-files-under, .) $(call all-c-files-under, .) +LOCAL_SRC_FILES := $(call all-subdir-cpp-files) $(call all-subdir-c-files) LOCAL_C_INCLUDES += \ external/libxml2/include \ @@ -50,6 +40,5 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := libxml2 LOCAL_MODULE := libnfc_nci_jni -LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) |