summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2015-03-05 00:00:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-05 00:01:33 +0000
commitc623ec973b5e8d1fd2ff4162d5de8701a6490121 (patch)
treed78b361229b131434f900b11b35e4df635c351b3 /Android.mk
parentef7aa4fc1901d5413bfa9a05f0a6c4f4d2d6575e (diff)
parent11fd96d6ff25bc1d710448eab545fe09da55a5f5 (diff)
downloadframeworks_base-c623ec973b5e8d1fd2ff4162d5de8701a6490121.zip
frameworks_base-c623ec973b5e8d1fd2ff4162d5de8701a6490121.tar.gz
frameworks_base-c623ec973b5e8d1fd2ff4162d5de8701a6490121.tar.bz2
Merge "MidiManager: Virtual MIDI devices are now implemented as Services"
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index f3f1acb..14dc4fa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -333,8 +333,8 @@ LOCAL_SRC_FILES += \
media/java/android/media/IRingtonePlayer.aidl \
media/java/android/media/IVolumeController.aidl \
media/java/android/media/audiopolicy/IAudioPolicyCallback.aidl \
+ media/java/android/media/midi/IMidiDeviceListener.aidl \
media/java/android/media/midi/IMidiDeviceServer.aidl \
- media/java/android/media/midi/IMidiListener.aidl \
media/java/android/media/midi/IMidiManager.aidl \
media/java/android/media/projection/IMediaProjection.aidl \
media/java/android/media/projection/IMediaProjectionCallback.aidl \