diff options
| author | Nick Pelly <npelly@google.com> | 2010-09-23 16:12:11 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-09-28 22:36:27 -0700 |
| commit | 038cabe0247ee46df62f9363f1a303bc5b9c1028 (patch) | |
| tree | 11c6037442f85e0e7adad870ba9d8092323b6bf0 /Android.mk | |
| parent | d6877fa4971710150de20453bf4ba54dca863429 (diff) | |
| download | frameworks_base-038cabe0247ee46df62f9363f1a303bc5b9c1028.zip frameworks_base-038cabe0247ee46df62f9363f1a303bc5b9c1028.tar.gz frameworks_base-038cabe0247ee46df62f9363f1a303bc5b9c1028.tar.bz2 | |
NFC integration
Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)
Conflicts:
core/java/android/app/ApplicationContext.java
core/java/android/provider/Settings.java
core/jni/Android.mk
core/jni/AndroidRuntime.cpp
core/res/AndroidManifest.xml
include/utils/Asset.h
Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -159,6 +159,14 @@ LOCAL_SRC_FILES += \ core/java/com/android/internal/view/IInputMethodClient.aidl \ core/java/com/android/internal/view/IInputMethodManager.aidl \ core/java/com/android/internal/view/IInputMethodSession.aidl \ + core/java/com/trustedlogic/trustednfc/android/ILlcpConnectionlessSocket.aidl \ + core/java/com/trustedlogic/trustednfc/android/ILlcpServiceSocket.aidl \ + core/java/com/trustedlogic/trustednfc/android/ILlcpSocket.aidl \ + core/java/com/trustedlogic/trustednfc/android/INdefTag.aidl \ + core/java/com/trustedlogic/trustednfc/android/INfcManager.aidl \ + core/java/com/trustedlogic/trustednfc/android/INfcTag.aidl \ + core/java/com/trustedlogic/trustednfc/android/IP2pInitiator.aidl \ + core/java/com/trustedlogic/trustednfc/android/IP2pTarget.aidl \ location/java/android/location/IGeocodeProvider.aidl \ location/java/android/location/IGpsStatusListener.aidl \ location/java/android/location/IGpsStatusProvider.aidl \ |