diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-10 16:31:23 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-10 16:31:23 -0700 |
| commit | e69ec574e6e15114e346b45157cb90d1dfe8ae42 (patch) | |
| tree | b8e0f78d0daf4dd02e7787802f89a898bf118ed2 /Android.mk | |
| parent | b61498d1ac8e25f0024dcde46b41bcf0d8336d89 (diff) | |
| parent | 732912a103e985520dba9c022a40bc21b4c4ced5 (diff) | |
| download | frameworks_base-e69ec574e6e15114e346b45157cb90d1dfe8ae42.zip frameworks_base-e69ec574e6e15114e346b45157cb90d1dfe8ae42.tar.gz frameworks_base-e69ec574e6e15114e346b45157cb90d1dfe8ae42.tar.bz2 | |
am 732912a1: Merge change 3730 into donut
Merge commit '732912a103e985520dba9c022a40bc21b4c4ced5'
* commit '732912a103e985520dba9c022a40bc21b4c4ced5':
Restructuring the TTS files so that it works as a Service
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -121,6 +121,8 @@ LOCAL_SRC_FILES += \ core/java/android/view/IWindowSession.aidl \ core/java/android/speech/IRecognitionListener.aidl \ core/java/android/speech/IRecognitionService.aidl \ + core/java/android/speech/tts/ITts.aidl \ + core/java/android/speech/tts/ITtsCallback.aidl \ core/java/com/android/internal/app/IBatteryStats.aidl \ core/java/com/android/internal/app/IUsageStats.aidl \ core/java/com/android/internal/appwidget/IAppWidgetService.aidl \ @@ -150,8 +152,6 @@ LOCAL_SRC_FILES += \ telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \ telephony/java/com/android/internal/telephony/IIccPhoneBook.aidl \ telephony/java/com/android/internal/telephony/ISms.aidl \ - tts/java/android/tts/ITtsCallback.aidl \ - tts/java/android/tts/ITts.aidl \ wifi/java/android/net/wifi/IWifiManager.aidl \ telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \ vpn/java/android/net/vpn/IVpnService.aidl \ |