summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'jb-mr1-release' of ↵Steve Kondik2012-12-271-0/+5
|\ | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/external/libnfc-nxp into aosp Conflicts: src/phHal4Nfc_ADD.c Change-Id: I950a66598954d21b49f723da2c58bff2ba719239
| * Add support for target-customized NFC stack configurationSebastian Niciarz2012-08-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows inclusion of target-customized configuration of NFC stack. The target-specific configuration will be stored in a header file, outside of AOSP. To have it icluded, define TARGET_HAS_NFC_CUSTOM_CONFIG macro and export your header file using BUILD_COPY_HEADERS macro. Change-Id: Ifa2d08c2ae8860c3f0690a04c517025892bd4c16 Author: Sebastian Niciarz <sebastian.niciarz@intel.com> Signed-off-by: Sebastian Niciarz <sebastian.niciarz@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 23071
* | card emulation patch port to JBdoug yeager2012-08-281-8/+9
|/ | | | Change-Id: I86657f9c547840de33c35df4912b5f282d4fe459
* Use NFC HAL for some libnfc settings.Martijn Coenen2011-11-031-1/+1
| | | | | | | | | | The NFC HAL in libhardware allows us to store and retrieve product-specific settings. This patch moves two product-specific settings to the HAL: the device port, and the usage of the i2c workaround we had for crespo. This means configuring the port no longer needs to be done from JNI land. Change-Id: I2e19b6f188f808bc2f2a1f1abc28f2a6c47e6a4c
* Manual port of 6900b4 from gingerbread:Rob von Behren2011-09-201-1/+1
| | | | | | | | | | Patch to add Secure Download Mechanism in the libnfc This patch permit to support secure download update and also to avoid locking states in case of download failures Bug: 5331837 Change-Id: Ia5b6d9baf57231b0193bbbe85c88c7df557017c6
* Add the ability to enable LLCP logging.Jeff Hamilton2011-07-261-0/+6
| | | | Change-Id: I94f16770d1803f89370df5a798a6c76670581a63
* libnfc spring cleaningNick Pelly2011-06-271-26/+11
| | | | | | | | | | o Fix most libnfc warnings, from 360 to 18 o Make DAL_DEBUG much less verbose and more useful o Clean up Android.mk Done with minimal textual diff to minimize merge conflicts. Change-Id: I918645500723ff7bb092ad9959628fcabac45bec
* Misc changes for Nexus Prime bringup.Nick Pelly2011-06-141-1/+1
| | | | | | | | | | o Fix uart read() implementation o Temporarily disable firmware update o Rename ttySx to ttyOx (this should be properly abstracted later) o Bug fix in #ifdef code o Update verbose logging arguments Change-Id: I87814e2be9ddbf5036d5586a2fd82311d56ec47f
* am 5d96b2d2: am 5a9fc269: Properly merge \'Patch to enable low level traces.\'Daniel Tomas2011-06-021-6/+4
|\ | | | | | | | | * commit '5d96b2d2dd4ba566dcb0fd5e1b5f0e84e458c4af': Properly merge 'Patch to enable low level traces.'
| * Properly merge 'Patch to enable low level traces.'Daniel Tomas2011-05-231-6/+4
| | | | | | | | Change-Id: Idfd097dacb3ce4979853cb60f97527d3a7b31ab4
* | am d9ebeefb: am 944e51f4: Merge from gingerbreadJean-Baptiste Queru2011-05-241-0/+6
|\ \ | |/ | | | | | | * commit 'd9ebeefb70213172ecd329095570aaa5684094e0': Patch to enable low level traces.
| * Merge from gingerbreadJean-Baptiste Queru2011-05-231-0/+6
| |\ | | | | | | | | | Change-Id: Ib6afd89a0a98acaecd9182785e53ae248157f988
| | * Patch to enable low level traces.Daniel Tomas2011-05-191-0/+4
| | | | | | | | | | | | | | | | | | | | | This patch permit to display the NFC frames exchanged through the I2C line. To enable that, you just need to enable LOW_LEVEL_TRACES macro. Change-Id: Ica2ff2e6d111b76c056161ec557346f23d21ada0
* | | external/libnfc-nxp: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-141-2/+2
|/ / | | | | | | | | Change-Id: I7ab7e314cdafb547346f4c6b17c2d51d43e212d0 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | am 4f3ef022: Support formatting / makeReadOnly() of NDEF on ICODE.Martijn Coenen2011-02-241-0/+1
|\ \ | |/ | | | | | | * commit '4f3ef022906e5d3b763fbcfe81e3f5cd53976ab5': Support formatting / makeReadOnly() of NDEF on ICODE.
| * Support formatting / makeReadOnly() of NDEF on ICODE.Martijn Coenen2011-02-251-0/+1
| | | | | | | | Change-Id: I2a7a185ead5de8f2b165c81dcc8ab8fb46c1ddc0
* | am a6e012a7: Added support for NDEF on ICODE.Martijn Coenen2011-02-241-0/+1
|\ \ | |/ | | | | | | * commit 'a6e012a748e70ab203655d4e1c0d0a77b6515fad': Added support for NDEF on ICODE.
| * Added support for NDEF on ICODE.Martijn Coenen2011-02-251-0/+1
| | | | | | | | | | | | This patch allows reading and writing of NDEF messages on ICODE tags. Change-Id: I43b4845c898c2bf268f609a5a81e991460059ff6
* | Merge 064d3925 from open-source masterJean-Baptiste Queru2010-12-291-1/+5
|\ \ | |/ |/| | | Change-Id: Ic81dffce6a683298fa97f473c469009313fc5647
| * Don't set ARM flags for non arm buildsBruce Beare2010-12-261-1/+5
| | | | | | | | | | Change-Id: Iee47aaa4c341812ed6671abc8b19bdd9dc4f77cf Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | Download feature added in the libnfcdaniel_Tomas2010-12-091-3/+6
|/ | | | Change-Id: Idfed8c90453a0acc7fa632f62a1e20617b4ae7f6
* Assign names to reader and writer thread so its easier to debug them.Nick Pelly2010-10-271-0/+1
| | | | | Change-Id: I2580675e2002546ac28a6a3a5ced7683af9448d9 Signed-off-by: Nick Pelly <npelly@google.com>
* NFC: Move NFC service jni from external/libnfc-nxp to packages/apps/Nfc.Nick Pelly2010-10-151-5/+24
| | | | | | | This was a temporary location. It is now in packages/apps/Nfc. Change-Id: I44033bb99fe1998496fc9d27f5f4f153d6e28348 Signed-off-by: Nick Pelly <npelly@google.com>
* Modify Android.mk for JNI.Nick Pelly2010-09-281-0/+2
| | | | | Change-Id: I08897e1c75193db5a9661164899cc502afb7816b Signed-off-by: Nick Pelly <npelly@google.com>
* Cleanup Android.mkNick Pelly2010-09-241-3/+2
| | | | | | | | Add LOCAL_MODULE_TAGS to Android.mk Remove noisy log. Change-Id: Id6a6b76b7dc6f5138cbdbe12caae9c249f2f4c5a Signed-off-by: Nick Pelly <npelly@google.com>
* Initial libnfc checkinNick Pelly2010-09-231-0/+126
Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010) Change-Id: Ie47f18423f949a8d3e0815d13f55c814312add24 Signed-off-by: Nick Pelly <npelly@google.com>
generated by cgit v1.1 at 2024-05-07 21:46:57 +0000