diff options
| -rw-r--r-- | Android.mk | 23 | ||||
| -rw-r--r-- | nxp/jni/Android.mk | 6 | ||||
| -rw-r--r-- | tests/Android.mk | 2 |
3 files changed, 6 insertions, 25 deletions
@@ -1,28 +1,6 @@ LOCAL_PATH:= $(call my-dir) ######################################## -# NXP 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, nxp) - -LOCAL_PACKAGE_NAME := Nfc -LOCAL_CERTIFICATE := platform - -LOCAL_JNI_SHARED_LIBRARIES := libnfc_jni - -LOCAL_PROGUARD_ENABLED := disabled - -include $(BUILD_PACKAGE) - -######################################## # NCI Configuration ######################################## include $(CLEAR_VARS) @@ -36,7 +14,6 @@ LOCAL_SRC_FILES += \ $(call all-java-files-under, nci) LOCAL_PACKAGE_NAME := NfcNci -LOCAL_OVERRIDES_PACKAGES := Nfc LOCAL_CERTIFICATE := platform LOCAL_JNI_SHARED_LIBRARIES := libnfc_nci_jni diff --git a/nxp/jni/Android.mk b/nxp/jni/Android.mk index 607c6644..c0e23dbe 100644 --- a/nxp/jni/Android.mk +++ b/nxp/jni/Android.mk @@ -33,4 +33,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libnfc_jni LOCAL_MODULE_TAGS := optional -include $(BUILD_SHARED_LIBRARY) +# !!! Intentionally commented out, we'll stop building +# the NXP stack in M, code will be removed in the +# next release. +# include $(BUILD_SHARED_LIBRARY) +# !!! diff --git a/tests/Android.mk b/tests/Android.mk index be8dff1f..ae91373c 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -26,6 +26,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := NfcTests LOCAL_CERTIFICATE := platform -LOCAL_INSTRUMENTATION_FOR := Nfc +LOCAL_INSTRUMENTATION_FOR := NfcNci include $(BUILD_PACKAGE) |