diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-13 17:25:24 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-10-17 18:35:29 -0700 |
| commit | cd0e839a2448deea50f79bddeba782c546b33893 (patch) | |
| tree | e8842c168d9048b47843c125661fc71831957cc5 /core/jni/Android.mk | |
| parent | dbb78f0e4ee3a1ba3e3418b0c1bf8b51e4fa2019 (diff) | |
| download | frameworks_base-cd0e839a2448deea50f79bddeba782c546b33893.zip frameworks_base-cd0e839a2448deea50f79bddeba782c546b33893.tar.gz frameworks_base-cd0e839a2448deea50f79bddeba782c546b33893.tar.bz2 | |
NFC: Move NFC service implementation out of system_server.
NFC service is now an application service in packages/apps/Nfc.
NFC service is registered through ServiceManager.addService(), and the proxy
object NfcAdapter obtains a handle to it through ServiceManager.getService().
**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and
modify service_manager.c, Process.java and PackageManagerService.java in order
to force the com.android.nfc process to take a fixed uid, so that it can use
ServiceManager.addService().
Most of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and
NdefMessage require some in-process native code, so android_com_NdefMessage.cpp
and android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to
a very small library libnfc_ndef.so that implements NDEF message parsing. This
has been added to core.mk so all devices (even without NFC hardware) can work
with NDEF data.
Bug: 3041259
Bug: 3097445
Change-Id: If7f00cd8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 64a2331..755f694 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -71,6 +71,8 @@ LOCAL_SRC_FILES:= \ android_net_TrafficStats.cpp \ android_net_wifi_Wifi.cpp \ android_nio_utils.cpp \ + android_nfc_NdefMessage.cpp \ + android_nfc_NdefRecord.cpp \ android_pim_EventRecurrence.cpp \ android_text_format_Time.cpp \ android_security_Md5MessageDigest.cpp \ @@ -196,20 +198,13 @@ LOCAL_SHARED_LIBRARIES := \ libicui18n \ libmedia \ libwpa_client \ - libjpeg + libjpeg \ + libnfc_ndef ifeq ($(USE_OPENGL_RENDERER),true) LOCAL_SHARED_LIBRARIES += libhwui endif -ifeq ($(BOARD_HAVE_NFC),true) -LOCAL_SHARED_LIBRARIES += \ - libnfc_jni \ - libnfc - -LOCAL_CFLAGS += -DHAVE_NFC -endif - ifeq ($(BOARD_HAVE_BLUETOOTH),true) LOCAL_C_INCLUDES += \ external/dbus \ |