diff options
| author | Martijn Coenen <maco@google.com> | 2012-07-25 15:07:43 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2012-07-27 18:33:54 -0700 |
| commit | c981340b7157e1b1873ca741f37b1ff19edae0b8 (patch) | |
| tree | 7a2d34db60e0ac35e458b7f7f146b6291969a7fa /Android.mk | |
| parent | 7a1d2adf875d414625853b3a5360663e420a3769 (diff) | |
| download | packages_apps_nfc-c981340b7157e1b1873ca741f37b1ff19edae0b8.zip packages_apps_nfc-c981340b7157e1b1873ca741f37b1ff19edae0b8.tar.gz packages_apps_nfc-c981340b7157e1b1873ca741f37b1ff19edae0b8.tar.bz2 | |
NFC: Initial NCI DeviceHost and JNI implementation.
From partner drop at 07/20. Modified to fit into our new
JNI/DH split.
New build config that builds two targets,
Nfc and NfcNci, each with their own dependencies. Product config files
have to specify either Nfc or NfcNci in their packages config.
Change-Id: I348a3aad7167195ca03baf9636408ab8e4c55fce
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 35 |
1 files changed, 29 insertions, 6 deletions
@@ -1,4 +1,8 @@ LOCAL_PATH:= $(call my-dir) + +######################################## +# NXP Configuration +######################################## include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional @@ -6,13 +10,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ $(call all-java-files-under, src) -ifeq ($(NFC_USE_NCI_STACK), true) - LOCAL_SRC_FILES += \ - $(call all-java-files-under, nci) -else - LOCAL_SRC_FILES += \ +LOCAL_SRC_FILES += \ $(call all-java-files-under, nxp) -endif LOCAL_PACKAGE_NAME := Nfc LOCAL_CERTIFICATE := platform @@ -25,6 +24,30 @@ LOCAL_PROGUARD_ENABLED := disabled include $(BUILD_PACKAGE) +######################################## +# NCI Configuration +######################################## +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_SRC_FILES := \ + $(call all-java-files-under, src) + +LOCAL_SRC_FILES += \ + $(call all-java-files-under, nci) + +LOCAL_PACKAGE_NAME := NfcNci +LOCAL_OVERRIDES_PACKAGES := Nfc +LOCAL_CERTIFICATE := platform + +LOCAL_STATIC_JAVA_LIBRARIES := NfcLogTags + +LOCAL_JNI_SHARED_LIBRARIES := libnfc_nci_jni + +LOCAL_PROGUARD_ENABLED := disabled + +include $(BUILD_PACKAGE) ##### # static lib for the log tags |