aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AN11690 - NXPNCI Android Porting Guidelines.pdfbin635483 -> 0 bytes
-rw-r--r--[-rwxr-xr-x]FactoryTestApp/Android.mk0
-rw-r--r--[-rwxr-xr-x]FactoryTestApp/NfcFactoryTestApp.c0
-rwxr-xr-x[-rw-r--r--]README.md5
-rwxr-xr-xinstall_NFC.sh14
-rwxr-xr-x[-rw-r--r--]nxpnfc_manifest.xml12
6 files changed, 16 insertions, 15 deletions
diff --git a/AN11690 - NXPNCI Android Porting Guidelines.pdf b/AN11690 - NXPNCI Android Porting Guidelines.pdf
deleted file mode 100644
index 1988efb..0000000
--- a/AN11690 - NXPNCI Android Porting Guidelines.pdf
+++ /dev/null
Binary files differ
diff --git a/FactoryTestApp/Android.mk b/FactoryTestApp/Android.mk
index a105efe..a105efe 100755..100644
--- a/FactoryTestApp/Android.mk
+++ b/FactoryTestApp/Android.mk
diff --git a/FactoryTestApp/NfcFactoryTestApp.c b/FactoryTestApp/NfcFactoryTestApp.c
index aaa4451..aaa4451 100755..100644
--- a/FactoryTestApp/NfcFactoryTestApp.c
+++ b/FactoryTestApp/NfcFactoryTestApp.c
diff --git a/README.md b/README.md
index ad2631b..6557881 100644..100755
--- a/README.md
+++ b/README.md
@@ -1,12 +1,13 @@
# nxpnfc_android_lollipop
This repository contains the files allowing to patch 5.1.1 lollipop version of AOSP source in order to add support for NXP-NCI NFC controllers (PN7120, PN7150) to an Android based system.
-It only applies to android version later than lollipop (for KitKat release see appriopriate repository [here](https://github.com/NXPNFCLinux/nxpnfc_android_kitkat)).
+It only applies to Lollipop Android versions (for other releases see appropriate repository: https://wiki.codeaurora.org/xwiki/bin/NCI+NFC+Controller+SW+resources/).
Information about NXP NFC Controller can be found on [NXP website](http://www.nxp.com/products/identification_and_security/nfc_and_reader_ics/nfc_controller_solutions/#overview).
-Further details about the stack and integration guidelines [here](https://github.com/NXPNFCLinux/nxpnfc_android_lollipop/blob/master/AN11690%20-%20NXPNCI%20Android%20Porting%20Guidelines.pdf).
+Further details about the stack and integration guidelines [here](https://www.nxp.com/docs/en/application-note/AN11690.pdf).
Release version
---------------
+ * R1.1: Repositories moved from Github to CodeAurora
* R1.0: Initial release based on NFC_NCIHALx_AR0F.3.5.0_L_OpnSrc
diff --git a/install_NFC.sh b/install_NFC.sh
index 8ccc5a7..4bfa6f6 100755
--- a/install_NFC.sh
+++ b/install_NFC.sh
@@ -21,15 +21,15 @@ rm -rf $ANDROID_BUILD_TOP/frameworks/base/nxp-nfc-gsma
echo
echo "- copying required files"
-mv $ANDROID_BUILD_TOP/NxpNfcAndroid/NFC_NCIHAL_base/core/java/android/nfc $ANDROID_BUILD_TOP/frameworks/base/core/java/android/
-mv $ANDROID_BUILD_TOP/NxpNfcAndroid/NFC_NCIHAL_base/core/java/com/nxp $ANDROID_BUILD_TOP/frameworks/base/core/java/com/
-mv $ANDROID_BUILD_TOP/NxpNfcAndroid/NFC_NCIHAL_base/core/java/com/vzw $ANDROID_BUILD_TOP/frameworks/base/core/java/com/
-mv $ANDROID_BUILD_TOP/NxpNfcAndroid/NFC_NCIHAL_base/nxp-nfc-gsma $ANDROID_BUILD_TOP/frameworks/base/
-rm -rf $ANDROID_BUILD_TOP/NxpNfcAndroid/NFC_NCIHAL_base
-rm -rf $ANDROID_BUILD_TOP/NxpNfcAndroid/NXPNFC_Reference
+mv $ANDROID_BUILD_TOP/NxpNfcAndroid/NfcAndroid_Base/core/java/android/nfc $ANDROID_BUILD_TOP/frameworks/base/core/java/android/
+mv $ANDROID_BUILD_TOP/NxpNfcAndroid/NfcAndroid_Base/core/java/com/nxp $ANDROID_BUILD_TOP/frameworks/base/core/java/com/
+mv $ANDROID_BUILD_TOP/NxpNfcAndroid/NfcAndroid_Base/core/java/com/vzw $ANDROID_BUILD_TOP/frameworks/base/core/java/com/
+mv $ANDROID_BUILD_TOP/NxpNfcAndroid/NfcAndroid_Base/nxp-nfc-gsma $ANDROID_BUILD_TOP/frameworks/base/
+rm -rf $ANDROID_BUILD_TOP/NxpNfcAndroid/NfcAndroid_Base
+rm -rf $ANDROID_BUILD_TOP/NxpNfcAndroid/NfcAndroid_Vendor
echo
-echo "- patching required makefile"
+echo "- patching required file"
cd $ANDROID_BUILD_TOP/frameworks/base
patch -p1 <$ANDROID_BUILD_TOP/NxpNfcAndroid/patch-framework_base.txt
cd $ANDROID_BUILD_TOP
diff --git a/nxpnfc_manifest.xml b/nxpnfc_manifest.xml
index 757c9a5..0e64b30 100644..100755
--- a/nxpnfc_manifest.xml
+++ b/nxpnfc_manifest.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
- <remote name="github_nfc" fetch="https://github.com" />
+ <remote name="CodeAurora" fetch="https://source.codeaurora.org/external" />
<remove-project name="platform/external/libnfc-nci" />
- <project path="external/libnfc-nci" name="NXPNFCProject/NFC_NCIHAL_libnfc-nci" remote="github_nfc" revision="refs/tags/NFC_NCIHALx_AR0F.3.5.0_L_OpnSrc"/>
+ <project path="external/libnfc-nci" name="nfcandroid/NfcAndroid_LibnfcNci" remote="CodeAurora" revision="refs/tags/NFC_NCIHALx_AR0F.3.5.0_L_OpnSrc"/>
<remove-project name="platform/packages/apps/Nfc" />
- <project path="packages/apps/Nfc" name="NXPNFCProject/NFC_NCIHAL_Nfc" remote="github_nfc" revision="refs/tags/NFC_NCIHALx_AR0F.3.5.0_L_OpnSrc"/>
+ <project path="packages/apps/Nfc" name="nfcandroid/NfcAndroid_Nfc" remote="CodeAurora" revision="refs/tags/NFC_NCIHALx_AR0F.3.5.0_L_OpnSrc"/>
- <project path="NxpNfcAndroid/NXPNFC_Reference" name="NXPNFCProject/NXPNFC_Reference" remote="github_nfc" revision="refs/tags/NFC_NCIHALx_AR0F.3.5.0_L_OpnSrc">
+ <project path="NxpNfcAndroid/NfcAndroid_Vendor" name="nfcandroid/NfcAndroid_Vendor" remote="CodeAurora" revision="refs/tags/NFC_NCIHALx_AR0F.3.5.0_L_OpnSrc">
<copyfile src="hardware/libhardware/include/hardware/nfc.h" dest="hardware/libhardware/include/hardware/nfc.h" />
</project>
- <project path="NxpNfcAndroid/NFC_NCIHAL_base" name="NXPNFCProject/NFC_NCIHAL_base" remote="github_nfc" revision="refs/tags/NFC_NCIHALx_AR0F.3.5.0_L_OpnSrc"/>
+ <project path="NxpNfcAndroid/NfcAndroid_Base" name="nfcandroid/NfcAndroid_Base" remote="CodeAurora" revision="refs/tags/NFC_NCIHALx_AR0F.3.5.0_L_OpnSrc"/>
- <project path="NxpNfcAndroid/" name="NXPNFCLinux/nxpnfc_android_lollipop" remote="github_nfc" revision="master"/>
+ <project path="NxpNfcAndroid/" name="nfcncisw/nxpnfc_android_lollipop" remote="CodeAurora" revision="master"/>
</manifest>