summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am fc36efee: Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
|\ | | | | | | | | * commit 'fc36efee6f6aefb561f92ef88c8eb40ac0aefa94': Fix comparison of String8 to char* literal
| * Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
| |\
| | * Fix comparison of String8 to char* literalBernhard Rosenkraenzer2014-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang (correctly) interprets if ("." == sName) as if ("." == (const char*)sName) and recognizes that comparing the pointers isn't what was meant. With if (sName == ".") both clang and gcc see and use String8::operator==(const char *), ensuring we get the wanted behavior. Change-Id: Ide240e13214a56f6899f72de3db75dac647e6d4b Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | am 8f230382: Merge "Fix a namespace collision."Dan Albert2014-09-221-5/+5
|\ \ \ | |/ / | | | | | | | | | * commit '8f230382b86e7b431211ceb0263d06c4bba1bf6b': Fix a namespace collision.
| * | Merge "Fix a namespace collision."Dan Albert2014-09-221-5/+5
| |\ \
| | * | Fix a namespace collision.Dan Albert2014-09-221-5/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | There's already an android::FileSource defined in media/libstagefright/FileSource.h, and the two can conflict at link time. Change-Id: Id8d80e96c68af1c9bb2a153630c84b923a4f4d06
* | | am fd7e0440: Merge "Check for NULL before calling asBinder()."Dan Albert2014-09-221-1/+2
|\ \ \ | |/ / | | | | | | | | | * commit 'fd7e04401fe28fdc093dfe4b399240378fd1f2f8': Check for NULL before calling asBinder().
| * | Merge "Check for NULL before calling asBinder()."Dan Albert2014-09-221-1/+2
| |\ \ | | |/ | |/|
| | * Check for NULL before calling asBinder().Dan Albert2014-09-161-1/+2
| |/ | | | | | | | | | | The old asBinder() checked if this == NULL, which is undefined behavior. Change-Id: Ibde628395ca10dfef0d2f59e81280576f104b83c
* | am 14fc930d: Merge "Clean up redundant links to stlport."Dan Albert2014-09-122-2/+0
|\ \ | |/ | | | | | | * commit '14fc930d5d2ef272b39342fa083f4097464fc9ea': Clean up redundant links to stlport.
| * Merge "Clean up redundant links to stlport."Dan Albert2014-09-112-2/+0
| |\
| | * Clean up redundant links to stlport.Dan Albert2014-09-112-2/+0
| |/ | | | | | | Change-Id: I4169b2476b7fd708102b971cf26cd92464b5c501
* | am 0d64fcb4: Merge "Clean up some makefiles."Dan Albert2014-09-122-6/+1
|\ \ | |/ | | | | | | * commit '0d64fcb46f594a89484cd112bc979903eaeda4b3': Clean up some makefiles.
| * Merge "Clean up some makefiles."Dan Albert2014-09-112-6/+1
| |\
| | * Clean up some makefiles.Dan Albert2014-09-112-6/+1
| | | | | | | | | | | | | | | | | | The build system takes care of these things for you. Change-Id: Ife9605f15786e11d6a3578f56ed83dd9ae7fd799
* | | am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-123-50/+3
|\ \ \ | |/ / | | | | | | | | | * commit '6bf7c5cfc981ce4ecbd671d73a9eab8398dc8dd4': Clean up test makefiles.
| * | Merge "Clean up test makefiles."Dan Albert2014-09-113-50/+3
| |\ \ | | |/ | |/|
| | * Clean up test makefiles.Dan Albert2014-09-113-50/+3
| | | | | | | | | | | | | | | | | | | | | | | | The build system takes care of linking the correct STL and gtest libraries for you, and specifying them manually confuses the build system when using libc++. Change-Id: I6ac66c2f4e97cd3c55efb7a85e10922420554e7f
* | | am 2b16391d: Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
|\ \ \ | |/ / | | | | | | | | | * commit '2b16391d066d20f38f3556d65bce827a8d134e4d': Add test for AMR-NB decoder
| * | Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
| |\ \
| | * | Add test for AMR-NB decoderAshok Bhat2014-06-162-0/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test accepts a .amr file as input and dumps output PCM in a wav file. To run the test, use following command libstagefright_amrnbdec_test <input amr> <output wav> Change-Id: I2492c2ed4e670c9fd8cb4213201ccbd0cb9bf8fe Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | am a9151741: Merge "Fix inline assembly for clang"Glenn Kasten2014-09-110-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a91517412e577e0f6128aa91a75460b313f0f4fe': Fix inline assembly for clang
| * | | Merge "Fix inline assembly for clang"Glenn Kasten2014-09-110-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Fix inline assembly for clangBernhard Rosenkränzer2013-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add r8, r0, asl #2 and add r8, r8, r0, asl #2 are identical in gcc inline assembly, but clang accepts only the latter variant. Change-Id: I922367984b6ae2f7268ce99facaf8da425c39d7e Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '032ecb7f233f392e6e68f030bf72a9bc7c861d11': Fix in SoftAVCEncoder plugin
| * | | Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
| |\ \ \
| | * | | Fix in SoftAVCEncoder pluginAshok Bhat2014-07-091-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size of buffer_handle_t, a pointer type, was assumed to be 4 bytes. This patch uses sizeof(buffer_handle_t) instead. In addition, replaced magic number 4 with sizeof(OMX_U32) Change-Id: Id5a7ed805a7b8e9867d8e51655cd334a66ac2c2b Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | am 45d2c7e1: Merge "Move chromium_http/support.cpp off androidGetTid."Elliott Hughes2014-08-181-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '45d2c7e1809e41e3d022f037aeec7e38646f6072': Move chromium_http/support.cpp off androidGetTid.
| * | | | Merge "Move chromium_http/support.cpp off androidGetTid."Elliott Hughes2014-08-161-1/+1
| |\ \ \ \
| | * | | | Move chromium_http/support.cpp off androidGetTid.Elliott Hughes2014-08-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 17048545 Change-Id: I9bb86908177d8c5350124b4f8bee448595eb32a4
* | | | | am d29b4f65: Merge "Use gettid directly."Elliott Hughes2014-08-181-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd29b4f656574d748f8e66a23028a690796b5fe2e': Use gettid directly.
| * | | | Merge "Use gettid directly."Elliott Hughes2014-08-161-1/+1
| |\ \ \ \
| | * | | | Use gettid directly.Elliott Hughes2014-08-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 17048545 Change-Id: I5ae40c2de1afc2a59f0b28e81c25f0c404368408
* | | | | am 5a192121: Merge "Revert "Fix build after side-stepping global -Bsymbolic.""Dan Albert2014-08-083-25/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5a192121e99a740dab6df2b6550e02ef18f5dbc7': Revert "Fix build after side-stepping global -Bsymbolic."
| * | | | Merge "Revert "Fix build after side-stepping global -Bsymbolic.""Dan Albert2014-08-073-25/+0
| |\ \ \ \
| | * | | | Revert "Fix build after side-stepping global -Bsymbolic."Dan Albert2014-08-083-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3b909164de79904137bb6661514d5ca6236a49c9. Bug: 16853291
* | | | | | am 9ee1572f: Merge "Fix PIC relocations for non-Bsymbolic builds"Dan Albert2014-08-087-0/+29
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '9ee1572f7f01797b7526de95cb322f90c9b626bd': Fix PIC relocations for non-Bsymbolic builds
| * | | | | Merge "Fix PIC relocations for non-Bsymbolic builds"Dan Albert2014-08-077-0/+29
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix PIC relocations for non-Bsymbolic buildsArd Biesheuvel2014-08-087-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ARM assembly contains a couple of hand-coded PC relative references to data defined in other object files. Make sure the externs are tagged as hidden so the linker knows that it can resolve the reference locally at build time. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com> Bug: 16853291 Change-Id: If7bc8e5bb6a2c63b9df33666d56e6c42f398fd47
* | | | | | am 07574544: Merge "Fix build after side-stepping global -Bsymbolic."Dan Albert2014-08-073-0/+25
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '07574544bda57f4227c7eadf5682f7bf86e42b26': Fix build after side-stepping global -Bsymbolic.
| * | | | | Merge "Fix build after side-stepping global -Bsymbolic."Dan Albert2014-08-073-0/+25
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix build after side-stepping global -Bsymbolic.Dan Albert2014-08-073-0/+25
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am a018cd49: Merge "Add SELinux MAC to DrmManagerService."Nick Kralevich2014-07-253-13/+91
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'a018cd4926460f8f5ab30a9a11df9775572d8620': Add SELinux MAC to DrmManagerService.
| * | | | Merge "Add SELinux MAC to DrmManagerService."Nick Kralevich2014-07-233-13/+91
| |\ \ \ \
| | * | | | Add SELinux MAC to DrmManagerService.Riley Spahn2014-07-253-13/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SELinux checks on all interfaces exposed by the DrmManagerService. Change-Id: Ib170d3229d88781b76e5fc1c557c8fed233df5d1
* | | | | | am cae00fcc: Merge "Remove last user of <cutils/tztime.h>."Elliott Hughes2014-07-242-4/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'cae00fcc369ff5d08e8ebccf3d2872048579ea83': Remove last user of <cutils/tztime.h>.
| * | | | | Merge "Remove last user of <cutils/tztime.h>."Elliott Hughes2014-07-232-4/+2
| |\ \ \ \ \
| | * | | | | Remove last user of <cutils/tztime.h>.Elliott Hughes2014-07-242-4/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15765976 Change-Id: Ib21abe9349bb1863304cd7618d8fc95ca254e8f6
* | | | | | am 3879792f: Merge "Remove 64-bit android_atomic uses from StateQueue."Hans Boehm2014-07-232-12/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '3879792f62e0d3eac295c703c1968a82022fddb1': Remove 64-bit android_atomic uses from StateQueue.
| * | | | | Merge "Remove 64-bit android_atomic uses from StateQueue."Hans Boehm2014-07-232-12/+8
| |\ \ \ \ \
generated by cgit v1.1 at 2025-01-10 09:28:21 +0000