diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-09-29 17:29:47 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2015-10-13 16:18:07 -0700 |
| commit | e208aeb621783e51b8464232ee515bca2fa0135f (patch) | |
| tree | e1c42cdd0359dcbdb87f905e33c03aa65b9d1fe9 /nci | |
| parent | 30931b1422ee081e7e7dd934415a29a4ffbce74f (diff) | |
| download | android_packages_apps_Nfc-e208aeb621783e51b8464232ee515bca2fa0135f.tar.gz android_packages_apps_Nfc-e208aeb621783e51b8464232ee515bca2fa0135f.tar.bz2 android_packages_apps_Nfc-e208aeb621783e51b8464232ee515bca2fa0135f.zip | |
Use global all-cpp-files-under
The build system now has a better implementation of all-cpp-files-under
Bug: 24204119
Change-Id: I9e1bf90559a894897ae829cb4f713cc5796584bc
Diffstat (limited to 'nci')
| -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) |