Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev

[android-x86/frameworks-base.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 1416472..dd56455 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -330,6 +330,7 @@ LOCAL_SRC_FILES += \
        media/java/android/media/IRemoteVolumeObserver.aidl \
        media/java/android/media/IRingtonePlayer.aidl \
        media/java/android/media/IVolumeController.aidl \
+        media/java/android/media/audiopolicy/IAudioPolicyCallback.aidl \
        media/java/android/media/projection/IMediaProjection.aidl \
        media/java/android/media/projection/IMediaProjectionCallback.aidl \
        media/java/android/media/projection/IMediaProjectionManager.aidl \
@@ -437,6 +438,7 @@ aidl_files := \
        frameworks/base/media/java/android/media/MediaDescription.aidl \
        frameworks/base/media/java/android/media/Rating.aidl \
        frameworks/base/media/java/android/media/AudioAttributes.aidl \
+       frameworks/base/media/java/android/media/AudioFocusInfo.aidl \
        frameworks/base/media/java/android/media/session/PlaybackState.aidl \
        frameworks/base/media/java/android/media/session/MediaSession.aidl \
        frameworks/base/media/java/android/media/tv/TvInputInfo.aidl \