diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-13 13:40:52 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-10-15 02:24:46 -0700 |
| commit | 28c491132f4f6bb38199e7f6e4121c3e71afe1f3 (patch) | |
| tree | 0a2a55e9718f7d02b05bb268797f6af1d9dc3593 /Android.mk | |
| parent | 0fb8aa8edcde194a1ac5e6116a6ce7ee374122b6 (diff) | |
| download | external_libnfc-nxp-28c491132f4f6bb38199e7f6e4121c3e71afe1f3.zip external_libnfc-nxp-28c491132f4f6bb38199e7f6e4121c3e71afe1f3.tar.gz external_libnfc-nxp-28c491132f4f6bb38199e7f6e4121c3e71afe1f3.tar.bz2 | |
NFC: Move NFC service jni from external/libnfc-nxp to packages/apps/Nfc.
This was a temporary location. It is now in packages/apps/Nfc.
Change-Id: I44033bb99fe1998496fc9d27f5f4f153d6e28348
Signed-off-by: Nick Pelly <npelly@google.com>
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 29 |
1 files changed, 24 insertions, 5 deletions
@@ -1,5 +1,9 @@ LOCAL_PATH:= $(call my-dir) +# +# libnfc +# + include $(CLEAR_VARS) LOCAL_PRELINK_MODULE := false @@ -82,9 +86,6 @@ LOCAL_SRC_FILES += src/phFriNfc_MifULFormat.c LOCAL_SRC_FILES += src/phFriNfc_MifStdFormat.c LOCAL_SRC_FILES += src/phFriNfc_SmtCrdFmt.c -#phFriNfc_NdefRecord -LOCAL_SRC_FILES += src/phFriNfc_NdefRecord.c - #phFriNfc_OvrHal LOCAL_SRC_FILES += src/phFriNfc_OvrHal.c @@ -99,7 +100,7 @@ LOCAL_SRC_FILES += Linux_x86/phDal4Nfc.c LOCAL_SRC_FILES += Linux_x86/phDal4Nfc_i2c.c LOCAL_SRC_FILES += Linux_x86/phDal4Nfc_messageQueueLib.c -LOCAL_CFLAGS += -DPHPN54X -DNXP_MESSAGING -DINCLUDE_DALINIT_DEINIT -pipe -fomit-frame-pointer -Wall -Wno-trigraphs -Werror-implicit-function-declaration -fno-strict-aliasing -mapcs -mno-sched-prolog -mabi=aapcs-linux -mno-thumb-interwork -msoft-float -Uarm -fno-common -fpic +LOCAL_CFLAGS += -DNXP_MESSAGING -DINCLUDE_DALINIT_DEINIT -pipe -fomit-frame-pointer -Wall -Wno-trigraphs -Werror-implicit-function-declaration -fno-strict-aliasing -mapcs -mno-sched-prolog -mabi=aapcs-linux -mno-thumb-interwork -msoft-float -Uarm -fno-common -fpic ifeq ($(NFC_BUILD_VARIANT),debug) LOCAL_CFLAGS += -DDEBUG -D_DEBUG @@ -120,8 +121,26 @@ LOCAL_CFLAGS += -I$(LOCAL_PATH)/src LOCAL_MODULE:= libnfc LOCAL_MODULE_TAGS := optional +LOCAL_SHARED_LIBRARIES := libcutils libnfc_ndef + +include $(BUILD_SHARED_LIBRARY) + +# +# libnfc_ndef +# + +include $(CLEAR_VARS) + +LOCAL_PRELINK_MODULE := false + +LOCAL_SRC_FILES += src/phFriNfc_NdefRecord.c + +LOCAL_CFLAGS += -I$(LOCAL_PATH)/inc +LOCAL_CFLAGS += -I$(LOCAL_PATH)/src + +LOCAL_MODULE:= libnfc_ndef +LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libcutils include $(BUILD_SHARED_LIBRARY) -include external/libnfc-nxp/trustedlogic/Android.mk
\ No newline at end of file |