summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/amrwbenc/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
|\ | | | | | | | | * commit '566a6fba127771c752fd40db84f1e7aafa520ea6': Add -no-integrated-as at local level.
| * Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-061-0/+3
| | | | | | | | | | | | | | Later we will enable integrated-as as default at the global level. BUG: 17820427 Change-Id: I8e67a152f82afdd1d6b81793ee7dd721ab2b59df
* | Resolved conflicts for merge of aed1d581 to lmp-dev-plus-aospDan Albert2014-08-081-10/+0
|\ \ | |/ | | | | Change-Id: Ib3877bfb60774d056fa2d934d2f4cb74e3b235ea
| * Revert "Fix build after side-stepping global -Bsymbolic."Dan Albert2014-08-081-10/+0
| | | | | | | | | | | | This reverts commit 3b909164de79904137bb6661514d5ca6236a49c9. Bug: 16853291
* | Resolved conflicts for merge of 2af8711d to lmp-dev-plus-aospDan Albert2014-08-071-0/+10
|\ \ | |/ | | | | Change-Id: I016dbca0318998f17fc741f873589c414774e7ff
| * Fix build after side-stepping global -Bsymbolic.Dan Albert2014-08-071-0/+10
| | | | | | | | | | | | | | | | Some of the assembly in the codecs is generating invalid relocations without -Bsymbolic. Leave it on for these projects for the time being. Bug: 16853291 Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c
| * Add liblogYing Wang2013-04-091-1/+1
| | | | | | | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* | warnings be gone.Andreas Huber2014-02-111-0/+4
| | | | | | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* | Add liblogYing Wang2013-04-091-1/+1
|/ | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* aacenc/amrwbenc: Remove the now unused LINUX defineMartin Storsjo2012-08-161-2/+0
| | | | | | | This is no longer used by the codec code (except for the amrwbenc sample). Change-Id: I78c7f62f257c490bf44477217975a93abcc7779e
* AV Android make files changesJames Dong2012-03-281-6/+6
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* Remove obsolete software codec header files and amr encoders.Andreas Huber2012-03-161-1/+0
| | | | Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7
* Switched to use the header files in /frameworks/nativeJames Dong2012-03-121-2/+2
| | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* The AMR WB software encoder is now an OMX component.Andreas Huber2012-02-011-0/+22
| | | | Change-Id: Iebfb2696783a0163369ba4e8ef72e19ee76ad893
* stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2012-01-121-2/+2
| | | | | | | | | | | | | | This was applied in AOSP master earlier, in commit b21611e5b0f1797e39e781d91ade023bac87637f, but when merged into the Google internal tree in 88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these changes have been brought in. (The diff of this merge commit and its first parent, d94b71d, is empty.) Therefore, reapply the rest of these changes on the files that still are present in the current version. Change-Id: I645a9b9134769958a11808a06163123d28d83e46
* frameworks/base: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-141-1/+1
| | | | | Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481 Signed-off-by: Iliyan Malchev <malchev@google.com>
* Initial software encoder checkinsJames Dong2010-05-191-0/+120
Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60