summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/aacenc/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* codecs: update for check ifeq ($(TARGET_ARCH),arm)Yongqin Liu2016-01-081-30/+22
| | | | | | | | | | This condition check will only pass when compile for 32bit platform. It will not pass when generate the 32bit binary or libarary for 64bit platform. update it with variants like LOCAL_SRC_FILES_arm to make it used by 32bit binary or library on 64biy platform as well Change-Id: Ia887610a97c68fa58925d2d86c5eb29cb397d6ef Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
* Merge commit 'c250980f' into manualmergeGlenn Kasten2014-03-191-1/+0
|\ | | | | | | Change-Id: I254d456e8cb6c580dd77d602b391bed09110454e
| * libstagefright is no longer 32 bit only.Narayan Kamath2014-03-191-1/+0
| | | | | | | | Change-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b Signed-off-by: Glenn Kasten <gkasten@android.com>
* | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-141-0/+1
|\ \ | |/ | | | | Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
| * mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-121-0/+1
| | | | | | | | | | | | also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
| * Add liblogYing Wang2013-04-091-2/+2
| | | | | | | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* | warnings be gone.Andreas Huber2014-02-111-0/+6
| | | | | | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* | Add liblogYing Wang2013-04-091-2/+2
|/ | | | | 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
* Update make fileDave Burke2012-06-121-2/+1
| | | | Change-Id: I7dbd128245f584df2689457df0dd12ce888cf8ef
* Revert "Revert to PV for AAC codec for FactoryROM."Dave Burke2012-05-211-2/+2
| | | | | | This reverts commit d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444. Change-Id: I7076feab31ab64fccd364699280d821011edc099
* Revert to PV for AAC codec for FactoryROM.Dave Burke2012-05-211-2/+2
| | | | Change-Id: I72cf856685c0c4bae745646f870a0415d416afb5
* Add Fraunhofer AAC encoder with AAC-ELD support.Dave Burke2012-04-251-16/+49
| | | | Change-Id: I6cd499d257d72f50a5b508bed97796a591a51506
* 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
* 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
* am 9de7793b: am 4f906362: am 97348431: am 704131cb: Merge changes ↵Jean-Baptiste Queru2012-03-011-1/+1
|\ | | | | | | | | | | | | | | | | I46c81dba,If1f40e9c,I652eaaa5 * commit '9de7793b425be89889412f3a86466d7b19055c3c': stagefright aacenc: Use QDADD/QDSUB instructions stagefright aacenc: Remove useless inline asm for simple right shift stagefright aacenc: Use ARMv6 SSAT instruction
| * stagefright aacenc: Use ARMv6 SSAT instructionMans Rullgard2012-01-131-1/+1
| | | | | | | | Change-Id: I652eaaa54e7766d9dca80fd8cc156ca481359471
* | The software AAC encoder is now an OMX component.Andreas Huber2012-01-261-0/+26
|/ | | | | | Yay. Change-Id: I74938a20b4e0a622836ea5184d3761180eb0f5de
* stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2012-01-121-1/+1
| | | | | | | | | | | | | | 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/+87
Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60