diff options
| author | Lajos Molnar <lajos@google.com> | 2015-04-22 19:28:53 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-04-22 22:45:08 -0700 |
| commit | c98f58efd147c574faa4a4f9956b5ab95e3027a5 (patch) | |
| tree | fa26839226dea7268b05ba22b46be0a06e64d909 /media/jni/Android.mk | |
| parent | c1d5487307aa5367bb321cafd9ac336beec39a7e (diff) | |
| download | frameworks_base-c98f58efd147c574faa4a4f9956b5ab95e3027a5.zip frameworks_base-c98f58efd147c574faa4a4f9956b5ab95e3027a5.tar.gz frameworks_base-c98f58efd147c574faa4a4f9956b5ab95e3027a5.tar.bz2 | |
media: add SyncSettings to MediaSync and MediaPlayer
Bug: 18249558
Change-Id: I76d7e20d0e0c2d1d24bf60ade6386986573476f0
Diffstat (limited to 'media/jni/Android.mk')
| -rw-r--r-- | media/jni/Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index c8464c7..dbb53b4 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ + android_media_AmrInputStream.cpp \ android_media_ImageWriter.cpp \ android_media_ImageReader.cpp \ android_media_MediaCrypto.cpp \ @@ -14,12 +15,12 @@ LOCAL_SRC_FILES:= \ android_media_MediaMetadataRetriever.cpp \ android_media_MediaMuxer.cpp \ android_media_MediaPlayer.cpp \ + android_media_MediaProfiles.cpp \ android_media_MediaRecorder.cpp \ android_media_MediaScanner.cpp \ android_media_MediaSync.cpp \ android_media_ResampleInputStream.cpp \ - android_media_MediaProfiles.cpp \ - android_media_AmrInputStream.cpp \ + android_media_SyncSettings.cpp \ android_media_Utils.cpp \ android_mtp_MtpDatabase.cpp \ android_mtp_MtpDevice.cpp \ |