diff options
| author | Bruno Martins <bgcngm@gmail.com> | 2015-10-15 18:03:45 +0100 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-31 23:23:53 -0700 |
| commit | 8504d88601671fdbd1fda0d7cc5b22531ceab025 (patch) | |
| tree | f918940eeab61eb88a45ac779a31206cd4bd4008 | |
| parent | f65e296c4e37a0796cb062b34086a681b35b857c (diff) | |
| download | android_packages_apps_Nfc-staging/cm-14.0-caf.tar.gz android_packages_apps_Nfc-staging/cm-14.0-caf.tar.bz2 android_packages_apps_Nfc-staging/cm-14.0-caf.zip | |
Revert "Stop building NXP stack."staging/cm-14.0-caf
This reverts commit 988c3fff5470a1de3a880bd07fa438cc47e283c8.
Change-Id: I787ea2b8a2c6977cefb1ad72952b8a1ed7a52660
| -rw-r--r-- | Android.mk | 23 | ||||
| -rw-r--r-- | nxp/jni/Android.mk | 6 | ||||
| -rw-r--r-- | tests/Android.mk | 2 |
3 files changed, 25 insertions, 6 deletions
@@ -1,6 +1,28 @@ 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) @@ -14,6 +36,7 @@ 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 c0e23dbe..607c6644 100644 --- a/nxp/jni/Android.mk +++ b/nxp/jni/Android.mk @@ -33,8 +33,4 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libnfc_jni LOCAL_MODULE_TAGS := optional -# !!! Intentionally commented out, we'll stop building -# the NXP stack in M, code will be removed in the -# next release. -# include $(BUILD_SHARED_LIBRARY) -# !!! +include $(BUILD_SHARED_LIBRARY) diff --git a/tests/Android.mk b/tests/Android.mk index ae91373c..be8dff1f 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 := NfcNci +LOCAL_INSTRUMENTATION_FOR := Nfc include $(BUILD_PACKAGE) |