diff options
author | Abhijith Shastry <ashastry@google.com> | 2014-11-13 22:15:44 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-13 22:15:46 +0000 |
commit | fb8db1c84b7fd59f596a6c090a8035fab08ef2f5 (patch) | |
tree | 0f8c3976578764b322cd01d9938e04cea7f24b41 /Android.mk | |
parent | a81b1cad2bc3c8eca7ae4046f79058daf02dc82c (diff) | |
parent | f9c50c45c615338bf9bfe57cd1ecff490051c997 (diff) | |
download | frameworks_base-fb8db1c84b7fd59f596a6c090a8035fab08ef2f5.zip frameworks_base-fb8db1c84b7fd59f596a6c090a8035fab08ef2f5.tar.gz frameworks_base-fb8db1c84b7fd59f596a6c090a8035fab08ef2f5.tar.bz2 |
Merge "new sms/mms carrier app API" into lmp-mr1-dev
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -202,6 +202,8 @@ LOCAL_SRC_FILES += \ core/java/android/os/IUpdateLock.aidl \ core/java/android/os/IUserManager.aidl \ core/java/android/os/IVibratorService.aidl \ + core/java/android/service/carriermessaging/ICarrierMessagingCallback.aidl \ + core/java/android/service/carriermessaging/ICarrierMessagingService.aidl \ core/java/android/service/notification/INotificationListener.aidl \ core/java/android/service/notification/IStatusBarNotificationHolder.aidl \ core/java/android/service/notification/IConditionListener.aidl \ @@ -522,6 +524,8 @@ aidl_files := \ frameworks/base/core/java/android/view/textservice/SpellCheckerInfo.aidl \ frameworks/base/core/java/android/view/textservice/SentenceSuggestionsInfo.aidl \ frameworks/base/core/java/android/view/textservice/SuggestionsInfo.aidl \ + frameworks/base/core/java/android/service/carriermessaging/MessagePdu.aidl \ + frameworks/base/core/java/android/service/carriermessaging/CarrierMessagingService.aidl \ frameworks/base/core/java/android/service/notification/StatusBarNotification.aidl \ frameworks/base/core/java/android/speech/tts/Voice.aidl \ frameworks/base/core/java/android/app/usage/UsageEvents.aidl \ |