summaryrefslogtreecommitdiffstats
path: root/media/libmedia/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* media: add ResourceManagerServiceRonghua Wu2015-03-231-0/+4
* am 88d74d20: Add missing AudioPolicy.cpp to Android.mkBrian Carlstrom2015-01-271-1/+2
|\
| * Add missing AudioPolicy.cpp to Android.mkBrian Carlstrom2015-01-271-1/+2
* | resolved conflicts for merge of 9391844d to masterMarco Nelissen2015-01-271-4/+1
|\ \ | |/
| * Remove MediaPlayerService::decode()Marco Nelissen2015-01-261-2/+0
| * Use callbacks for Midi I/OMarco Nelissen2015-01-081-0/+1
* | Move roundup from frameworks/av to system/mediaGlenn Kasten2015-01-071-2/+0
* | am 991aa3a7: am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL ...Narayan Kamath2015-01-051-2/+0
|\ \
| * \ am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."Narayan Kamath2015-01-051-2/+0
| |\ \ | | |/
| | * Remove hardcoded ICU & OpenSSL include paths.Narayan Kamath2015-01-051-2/+0
* | | Merge "Remove explicit instantiation of SingleStateQueue"Andy Hung2014-12-221-11/+0
|\ \ \
| * | | Remove explicit instantiation of SingleStateQueueAndy Hung2014-12-191-11/+0
| |/ /
* | | Use callbacks for Midi I/OMarco Nelissen2014-12-161-0/+1
|/ /
* | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ...Eric Laurent2014-12-101-1/+2
|\ \ | |/ |/|
| * audio policy: add support for custom mixesEric Laurent2014-12-091-1/+2
* | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-171-2/+0
* | Resolve conflictThe Android Open Source Project2014-11-061-23/+27
|\ \ | |/
| * Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-devMarco Nelissen2014-09-031-2/+3
| |\
| | * Use CharacterEncodingDetector in metadataretrieverMarco Nelissen2014-09-021-2/+3
| * | [AU]Sync libmedia/Android.mk modification from KLP-SproutHochi Huang2014-08-291-1/+1
| |/
| * stagefright: rework media codec list and infosLajos Molnar2014-08-071-0/+3
| * resolved conflicts for merge of 373e21cc to masterElliott Hughes2014-07-091-2/+2
| |\
| * | audio policy: add routing update client interfaceEric Laurent2014-05-291-0/+1
| * | Fix includes to no longer pull in Skia includes directories.Derek Sollenberger2014-02-271-1/+0
| * | Simplify and remove old commentGlenn Kasten2014-02-181-3/+1
| * | Move StateQueueInstantiations to libinstantssqGlenn Kasten2014-02-181-6/+16
| * | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-041-0/+2
| * | Better character set encoding detectionMarco Nelissen2013-12-111-2/+3
* | | Fix definining of ANDROID_SMP.Ian Rogers2014-11-061-1/+14
| |/ |/|
* | Switch frameworks/av/media/libmedia to the new icu.Elliott Hughes2014-07-091-1/+1
|/
* Instantiate SingleStateQueue<AudioTimestamp>Glenn Kasten2013-09-031-0/+1
* libutils clean-upMathias Agopian2013-05-071-1/+2
* Add liblogYing Wang2013-04-091-1/+1
* Implement async event callout from drm plugin to Java appJeff Tinker2013-04-031-0/+1
* Implementing MediaDrm APIsJeff Tinker2013-03-131-0/+1
* Add template class SingleStateQueueGlenn Kasten2013-03-051-0/+7
* Add media.log service based on NBLogGlenn Kasten2013-01-251-0/+1
* Split off the current control block to separate fileGlenn Kasten2012-12-031-0/+1
* Remove obsolete references to libmedia_nativeGlenn Kasten2012-10-301-1/+1
* am e7c992c6: am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat...Elliott Hughes2012-09-091-1/+0
|\
| * Fix libmedia and libstagefright to get expat header files from the approved l...Elliott Hughes2012-09-091-1/+0
* | Implement remote display service stubs.Jeff Brown2012-09-051-0/+2
* | Preliminary support for HDCP as a binder service for wifi display support.Andreas Huber2012-08-291-0/+1
|/
* Merge "Provisional support for secure decryption of media streams."Andreas Huber2012-03-261-0/+1
|\
| * Provisional support for secure decryption of media streams.Andreas Huber2012-03-261-0/+1
* | Merge "reorganize SoundPool and JetPlayer code."Eric Laurent2012-03-261-1/+3
|\ \ | |/ |/|
| * reorganize SoundPool and JetPlayer code.Eric Laurent2012-03-261-1/+3
* | Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.James Dong2012-03-241-1/+0
|/
* Revert "Split libmedia into libmedia and libmedia_native"Glenn Kasten2012-03-231-14/+35
* Split libmedia into libmedia and libmedia_nativeGlenn Kasten2012-03-211-35/+14