summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorfredc <fredc@broadcom.com>2012-04-12 00:02:00 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-16 21:20:54 -0700
commit0f42037eb7b5118015c2caca635538324ccf0ccf (patch)
tree46a7ba36216a2cb617541ec68f18b413419e148f /Android.mk
parent919a4c6264b733585152ce1dc6f868c1093d368b (diff)
downloadframeworks_base-0f42037eb7b5118015c2caca635538324ccf0ccf.zip
frameworks_base-0f42037eb7b5118015c2caca635538324ccf0ccf.tar.gz
frameworks_base-0f42037eb7b5118015c2caca635538324ccf0ccf.tar.bz2
Non persistent adapter service
Change-Id: Ib13d5c77416e58161df0e04d7a15ec0dddbde8b5 Conflicts: core/java/android/bluetooth/BluetoothInputDevice.java Conflicts: core/java/com/android/internal/app/ShutdownThread.java services/java/com/android/server/SystemServer.java Conflicts: services/java/com/android/server/SystemServer.java services/java/com/android/server/pm/ShutdownThread.java
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 8481e72..5fb66ab 100644
--- a/Android.mk
+++ b/Android.mk
@@ -93,6 +93,9 @@ LOCAL_SRC_FILES += \
core/java/android/bluetooth/IBluetoothHealth.aidl \
core/java/android/bluetooth/IBluetoothHealthCallback.aidl \
core/java/android/bluetooth/IBluetoothInputDevice.aidl \
+ core/java/android/bluetooth/IBluetoothPan.aidl \
+ core/java/android/bluetooth/IBluetoothManager.aidl \
+ core/java/android/bluetooth/IBluetoothManagerCallback.aidl \
core/java/android/bluetooth/IBluetoothPbap.aidl \
core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \
core/java/android/content/IClipboard.aidl \