Merge "Don't enable reader mode when NFC is disabled." into mnc-dr-dev
diff --git a/nci/jni/Android.mk b/nci/jni/Android.mk
index 4f39506..1e33ca6 100644
--- a/nci/jni/Android.mk
+++ b/nci/jni/Android.mk
@@ -6,23 +6,13 @@
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_STATIC_LIBRARIES := libxml2
LOCAL_MODULE := libnfc_nci_jni
-LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
