diff options
| author | Suchi Amalapurapu <asuchitra@google.com> | 2009-06-17 18:24:44 -0700 |
|---|---|---|
| committer | Suchi Amalapurapu <asuchitra@google.com> | 2009-06-17 18:24:44 -0700 |
| commit | e1fae30e20b1515eeb036a7c103e1e70de130bdd (patch) | |
| tree | 7cafbd21f0df7606d64ea19e07c622efe4dbc6b4 /Android.mk | |
| parent | 253e8e34b323f05bb7d5fdc8591bdaadbab55dd6 (diff) | |
| parent | 0781df943e5a7a72ac82394874b6200d14ddd02c (diff) | |
| download | frameworks_base-e1fae30e20b1515eeb036a7c103e1e70de130bdd.zip frameworks_base-e1fae30e20b1515eeb036a7c103e1e70de130bdd.tar.gz frameworks_base-e1fae30e20b1515eeb036a7c103e1e70de130bdd.tar.bz2 | |
Merge commit '0781df94' into manualmerge
Conflicts:
Android.mk
api/current.xml
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -73,10 +73,8 @@ LOCAL_SRC_FILES += \ core/java/android/app/IActivityPendingResult.aidl \ core/java/android/app/IActivityWatcher.aidl \ core/java/android/app/IAlarmManager.aidl \ - core/java/android/app/IBackupAgent.aidl \ + core/java/android/app/IBackupAgent.aidl \ core/java/android/app/IInstrumentationWatcher.aidl \ - core/java/android/app/IIntentReceiver.aidl \ - core/java/android/app/IIntentSender.aidl \ core/java/android/app/INotificationManager.aidl \ core/java/android/app/ISearchManager.aidl \ core/java/android/app/ISearchManagerCallback.aidl \ @@ -92,6 +90,8 @@ LOCAL_SRC_FILES += \ core/java/android/bluetooth/IBluetoothDevice.aidl \ core/java/android/bluetooth/IBluetoothHeadset.aidl \ core/java/android/content/IContentService.aidl \ + core/java/android/content/IIntentReceiver.aidl \ + core/java/android/content/IIntentSender.aidl \ core/java/android/content/ISyncAdapter.aidl \ core/java/android/content/ISyncContext.aidl \ core/java/android/content/ISyncStatusObserver.aidl \ @@ -203,6 +203,7 @@ aidl_files := \ frameworks/base/core/java/android/app/PendingIntent.aidl \ frameworks/base/core/java/android/content/ComponentName.aidl \ frameworks/base/core/java/android/content/Intent.aidl \ + frameworks/base/core/java/android/content/IntentSender.aidl \ frameworks/base/core/java/android/content/SyncStats.aidl \ frameworks/base/core/java/android/content/res/Configuration.aidl \ frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \ |