Move NXP JNI and DeviceHost implementation into separate dir.

Preparation for the new NCI stack. The idea is to
build either the NXP or the NCI stack, triggered
by a makefile switch. To that end, move the
DeviceHost and JNI implementations in their own
directory, so we can build them only if needed.

Change-Id: I8579ec30ceb1908e4cd180cfbd10224aa4bddb8d

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
 

nxp/Android.mk

+LOCAL_PATH:= $(call my-dir)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))

src/com/android/nfc/nxp/NativeLlcpConnectionlessSocket.java → 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;

src/com/android/nfc/nxp/NativeLlcpServiceSocket.java → 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;

src/com/android/nfc/nxp/NativeLlcpSocket.java → 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;
 

src/com/android/nfc/nxp/NativeNfcManager.java → 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;

src/com/android/nfc/nxp/NativeNfcSecureElement.java → 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;

src/com/android/nfc/nxp/NativeNfcTag.java → 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;