summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.mk8
-rw-r--r--nxp/jni/Android.mk (renamed from jni/Android.mk)0
-rw-r--r--nxp/jni/com_android_nfc.cpp (renamed from jni/com_android_nfc.cpp)0
-rw-r--r--nxp/jni/com_android_nfc.h (renamed from jni/com_android_nfc.h)0
-rw-r--r--nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp (renamed from jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp)0
-rw-r--r--nxp/jni/com_android_nfc_NativeLlcpServiceSocket.cpp (renamed from jni/com_android_nfc_NativeLlcpServiceSocket.cpp)0
-rw-r--r--nxp/jni/com_android_nfc_NativeLlcpSocket.cpp (renamed from jni/com_android_nfc_NativeLlcpSocket.cpp)0
-rw-r--r--nxp/jni/com_android_nfc_NativeNfcManager.cpp (renamed from jni/com_android_nfc_NativeNfcManager.cpp)0
-rwxr-xr-xnxp/jni/com_android_nfc_NativeNfcSecureElement.cpp (renamed from jni/com_android_nfc_NativeNfcSecureElement.cpp)0
-rw-r--r--nxp/jni/com_android_nfc_NativeNfcTag.cpp (renamed from jni/com_android_nfc_NativeNfcTag.cpp)0
-rw-r--r--nxp/jni/com_android_nfc_NativeP2pDevice.cpp (renamed from jni/com_android_nfc_NativeP2pDevice.cpp)0
-rw-r--r--nxp/jni/com_android_nfc_list.cpp (renamed from jni/com_android_nfc_list.cpp)0
-rw-r--r--nxp/jni/com_android_nfc_list.h (renamed from jni/com_android_nfc_list.h)0
-rwxr-xr-xnxp/src/com/android/nfc/dhimpl/NativeLlcpConnectionlessSocket.java (renamed from src/com/android/nfc/nxp/NativeLlcpConnectionlessSocket.java)2
-rwxr-xr-xnxp/src/com/android/nfc/dhimpl/NativeLlcpServiceSocket.java (renamed from src/com/android/nfc/nxp/NativeLlcpServiceSocket.java)2
-rwxr-xr-xnxp/src/com/android/nfc/dhimpl/NativeLlcpSocket.java (renamed from src/com/android/nfc/nxp/NativeLlcpSocket.java)2
-rwxr-xr-xnxp/src/com/android/nfc/dhimpl/NativeNfcManager.java (renamed from src/com/android/nfc/nxp/NativeNfcManager.java)2
-rwxr-xr-xnxp/src/com/android/nfc/dhimpl/NativeNfcSecureElement.java (renamed from src/com/android/nfc/nxp/NativeNfcSecureElement.java)2
-rwxr-xr-xnxp/src/com/android/nfc/dhimpl/NativeNfcTag.java (renamed from src/com/android/nfc/nxp/NativeNfcTag.java)2
-rwxr-xr-xnxp/src/com/android/nfc/dhimpl/NativeP2pDevice.java (renamed from src/com/android/nfc/nxp/NativeP2pDevice.java)2
-rwxr-xr-xsrc/com/android/nfc/NfcService.java4
21 files changed, 17 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk
index a041854a..2cdfc684 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,6 +6,14 @@ 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 += \
+ $(call all-java-files-under, nxp)
+endif
+
LOCAL_PACKAGE_NAME := Nfc
LOCAL_CERTIFICATE := platform
diff --git a/jni/Android.mk b/nxp/jni/Android.mk
index 8ae792a2..8ae792a2 100644
--- a/jni/Android.mk
+++ b/nxp/jni/Android.mk
diff --git a/jni/com_android_nfc.cpp b/nxp/jni/com_android_nfc.cpp
index d794d6ec..d794d6ec 100644
--- a/jni/com_android_nfc.cpp
+++ b/nxp/jni/com_android_nfc.cpp
diff --git a/jni/com_android_nfc.h b/nxp/jni/com_android_nfc.h
index b876dadf..b876dadf 100644
--- a/jni/com_android_nfc.h
+++ b/nxp/jni/com_android_nfc.h
diff --git a/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp b/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp
index 188edb40..188edb40 100644
--- a/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp
+++ b/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp
diff --git a/jni/com_android_nfc_NativeLlcpServiceSocket.cpp b/nxp/jni/com_android_nfc_NativeLlcpServiceSocket.cpp
index 92de3e40..92de3e40 100644
--- a/jni/com_android_nfc_NativeLlcpServiceSocket.cpp
+++ b/nxp/jni/com_android_nfc_NativeLlcpServiceSocket.cpp
diff --git a/jni/com_android_nfc_NativeLlcpSocket.cpp b/nxp/jni/com_android_nfc_NativeLlcpSocket.cpp
index 0c0b8308..0c0b8308 100644
--- a/jni/com_android_nfc_NativeLlcpSocket.cpp
+++ b/nxp/jni/com_android_nfc_NativeLlcpSocket.cpp
diff --git a/jni/com_android_nfc_NativeNfcManager.cpp b/nxp/jni/com_android_nfc_NativeNfcManager.cpp
index e6da0fad..e6da0fad 100644
--- a/jni/com_android_nfc_NativeNfcManager.cpp
+++ b/nxp/jni/com_android_nfc_NativeNfcManager.cpp
diff --git a/jni/com_android_nfc_NativeNfcSecureElement.cpp b/nxp/jni/com_android_nfc_NativeNfcSecureElement.cpp
index bf0bffc1..bf0bffc1 100755
--- a/jni/com_android_nfc_NativeNfcSecureElement.cpp
+++ b/nxp/jni/com_android_nfc_NativeNfcSecureElement.cpp
diff --git a/jni/com_android_nfc_NativeNfcTag.cpp b/nxp/jni/com_android_nfc_NativeNfcTag.cpp
index dbf8dc92..dbf8dc92 100644
--- a/jni/com_android_nfc_NativeNfcTag.cpp
+++ b/nxp/jni/com_android_nfc_NativeNfcTag.cpp
diff --git a/jni/com_android_nfc_NativeP2pDevice.cpp b/nxp/jni/com_android_nfc_NativeP2pDevice.cpp
index b3cc6e3a..b3cc6e3a 100644
--- a/jni/com_android_nfc_NativeP2pDevice.cpp
+++ b/nxp/jni/com_android_nfc_NativeP2pDevice.cpp
diff --git a/jni/com_android_nfc_list.cpp b/nxp/jni/com_android_nfc_list.cpp
index f0487d3c..f0487d3c 100644
--- a/jni/com_android_nfc_list.cpp
+++ b/nxp/jni/com_android_nfc_list.cpp
diff --git a/jni/com_android_nfc_list.h b/nxp/jni/com_android_nfc_list.h
index 22b4f092..22b4f092 100644
--- a/jni/com_android_nfc_list.h
+++ b/nxp/jni/com_android_nfc_list.h
diff --git a/src/com/android/nfc/nxp/NativeLlcpConnectionlessSocket.java b/nxp/src/com/android/nfc/dhimpl/NativeLlcpConnectionlessSocket.java
index c9d3b5d5..db784966 100755
--- a/src/com/android/nfc/nxp/NativeLlcpConnectionlessSocket.java
+++ b/nxp/src/com/android/nfc/dhimpl/NativeLlcpConnectionlessSocket.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.nfc.nxp;
+package com.android.nfc.dhimpl;
import com.android.nfc.DeviceHost;
import com.android.nfc.LlcpPacket;
diff --git a/src/com/android/nfc/nxp/NativeLlcpServiceSocket.java b/nxp/src/com/android/nfc/dhimpl/NativeLlcpServiceSocket.java
index 531afd80..3a7e57f7 100755
--- a/src/com/android/nfc/nxp/NativeLlcpServiceSocket.java
+++ b/nxp/src/com/android/nfc/dhimpl/NativeLlcpServiceSocket.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.nfc.nxp;
+package com.android.nfc.dhimpl;
import com.android.nfc.DeviceHost;
import com.android.nfc.DeviceHost.LlcpSocket;
diff --git a/src/com/android/nfc/nxp/NativeLlcpSocket.java b/nxp/src/com/android/nfc/dhimpl/NativeLlcpSocket.java
index a337d354..69506c5a 100755
--- a/src/com/android/nfc/nxp/NativeLlcpSocket.java
+++ b/nxp/src/com/android/nfc/dhimpl/NativeLlcpSocket.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.nfc.nxp;
+package com.android.nfc.dhimpl;
import com.android.nfc.DeviceHost;
diff --git a/src/com/android/nfc/nxp/NativeNfcManager.java b/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
index 4bd8c24a..f9696275 100755
--- a/src/com/android/nfc/nxp/NativeNfcManager.java
+++ b/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.nfc.nxp;
+package com.android.nfc.dhimpl;
import com.android.nfc.DeviceHost;
import com.android.nfc.LlcpException;
diff --git a/src/com/android/nfc/nxp/NativeNfcSecureElement.java b/nxp/src/com/android/nfc/dhimpl/NativeNfcSecureElement.java
index 88f9b9d4..e2d91ec5 100755
--- a/src/com/android/nfc/nxp/NativeNfcSecureElement.java
+++ b/nxp/src/com/android/nfc/dhimpl/NativeNfcSecureElement.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.nfc.nxp;
+package com.android.nfc.dhimpl;
import android.content.Context;
import android.content.SharedPreferences;
diff --git a/src/com/android/nfc/nxp/NativeNfcTag.java b/nxp/src/com/android/nfc/dhimpl/NativeNfcTag.java
index 8996dfbe..eddde94e 100755
--- a/src/com/android/nfc/nxp/NativeNfcTag.java
+++ b/nxp/src/com/android/nfc/dhimpl/NativeNfcTag.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.nfc.nxp;
+package com.android.nfc.dhimpl;
import com.android.nfc.DeviceHost.TagEndpoint;
diff --git a/src/com/android/nfc/nxp/NativeP2pDevice.java b/nxp/src/com/android/nfc/dhimpl/NativeP2pDevice.java
index 7c7db419..094f46a5 100755
--- a/src/com/android/nfc/nxp/NativeP2pDevice.java
+++ b/nxp/src/com/android/nfc/dhimpl/NativeP2pDevice.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.nfc.nxp;
+package com.android.nfc.dhimpl;
import com.android.nfc.DeviceHost.NfcDepEndpoint;
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 602b25d8..3e7a6b58 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -23,8 +23,8 @@ import com.android.nfc.DeviceHost.LlcpSocket;
import com.android.nfc.DeviceHost.NfcDepEndpoint;
import com.android.nfc.DeviceHost.TagEndpoint;
import com.android.nfc.handover.HandoverManager;
-import com.android.nfc.nxp.NativeNfcManager;
-import com.android.nfc.nxp.NativeNfcSecureElement;
+import com.android.nfc.dhimpl.NativeNfcManager;
+import com.android.nfc.dhimpl.NativeNfcSecureElement;
import android.app.Application;
import android.app.KeyguardManager;
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 06:07:04 +0000