summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Disable warnings that are not easily fixable"Glenn Kasten2016-04-201-0/+1
|\ | | | | | | | | | | | | | | | | am: 8192b1a * commit '8192b1a98f60cc39253c658ba1ca70a70c2e0dfa': Disable warnings that are not easily fixable Change-Id: I5dc1fabd29cfb7024f8362359a796efd1764032d
| * Merge "Disable warnings that are not easily fixable"Glenn Kasten2016-04-201-0/+1
| |\
| | * Disable warnings that are not easily fixableGlenn Kasten2016-04-181-0/+1
| | | | | | | | | | | | | | | Bug: 28026175 Change-Id: I6e9cfcd9efeb853caee01b54b241f24e64cf1e94
* | | Merge "Add default case for undefined pointer initialization"Glenn Kasten2016-04-201-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 9d0179c * commit '9d0179c8a85f2b50bafdf6715fc266bc92771756': Add default case for undefined pointer initialization Change-Id: I311521adebb1949747f0cb34bee19a57d8199558
| * | Merge "Add default case for undefined pointer initialization"Glenn Kasten2016-04-201-0/+3
| |\|
| | * Add default case for undefined pointer initializationGlenn Kasten2016-04-181-0/+3
| | | | | | | | | | | | | | | Bug: 28026175 Change-Id: I1b149bf1573296df18abbe44f737bd87ab3913f9
* | | Merge "Left shift of negative int is undefined"Glenn Kasten2016-04-201-25/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 6ae5480 * commit '6ae54806ab88efd76e884447680fd30b340936fd': Left shift of negative int is undefined Change-Id: If6a4abe686d3ab6b7f825058255b03aa46055484
| * | Merge "Left shift of negative int is undefined"Glenn Kasten2016-04-201-25/+25
| |\|
| | * Left shift of negative int is undefinedGlenn Kasten2016-04-181-25/+25
| | | | | | | | | | | | | | | Bug: 28026175 Change-Id: I9dc851b818262e95711033bdc03b7b7f30cff133
* | | Merge "Remove redundant parentheses around == comparison operator"Glenn Kasten2016-04-204-7/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 34fb053 * commit '34fb05353bbabe1ba04362f26b3ae507fbb687d4': Remove redundant parentheses around == comparison operator Change-Id: I7a37ef8293371cc0287a0e0b9f0115f82f294b31
| * | Merge "Remove redundant parentheses around == comparison operator"Glenn Kasten2016-04-204-7/+6
|/| | | |/
| * Remove redundant parentheses around == comparison operatorGlenn Kasten2016-04-184-7/+6
|/ | | | | Bug: 28026175 Change-Id: I8ff9d8d1dd73933dc181f2745292a0a3398a2479
* Remove __DATE__/__TIME__Dan Willemsen2015-11-030-0/+0
|\ | | | | | | | | | | | | am: 2d435aa433 * commit '2d435aa43323935bd8ed293f4f12cddfdee81eb3': Remove __DATE__/__TIME__
| * Remove __DATE__/__TIME__Dan Willemsen2015-10-3011-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | Building __DATE__/__TIME__ into the binaries means that every build will create different binaries, even if all the sources are identical. This also means that any libraries including this one will need to be patched during every OTA. Nothing appears to use the build_date/build_time fields, so just replace them with empty strings. Bug: 24204119 Change-Id: I9543eb388a1e8ab9284df9035a62fc8942cdc082 (cherry picked from commit 6e8330732f61d1da1485fc07b61444f490d5e623)
* | Merge "Remove __DATE__/__TIME__"Dan Willemsen2015-10-2711-0/+55
|\ \ | | | | | | | | | | | | | | | | | | am: a73b059815 * commit 'a73b059815fc35ba689e5a8235b567b2353eabad': Remove __DATE__/__TIME__
| * \ Merge "Remove __DATE__/__TIME__"Dan Willemsen2015-10-2711-0/+55
| |\ \
| | * | Remove __DATE__/__TIME__Dan Willemsen2015-10-2311-0/+55
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building __DATE__/__TIME__ into the binaries means that every build will create different binaries, even if all the sources are identical. This also means that any libraries including this one will need to be patched during every OTA. Nothing appears to use the build_date/build_time fields, so just replace them with empty strings. Bug: 24204119 Change-Id: I9543eb388a1e8ab9284df9035a62fc8942cdc082
* | | am 9f42dfb7: am b3c5a4bb: Fix crash on invalid channel configMarco Nelissen2015-09-151-2/+5
|\ \ \ | | |/ | |/| | | | | | | * commit '9f42dfb7990a107da23454669459bb5e28d90726': Fix crash on invalid channel config
| * | am b3c5a4bb: Fix crash on invalid channel configMarco Nelissen2015-09-151-2/+5
| |\ \ | | | | | | | | | | | | | | | | * commit 'b3c5a4bb8442ab3158fa1f52b790fadc64546f46': Fix crash on invalid channel config
| | * | Fix crash on invalid channel configMarco Nelissen2015-09-081-2/+5
| | | | | | | | | | | | | | | | | | | | Bug: 23876444 Change-Id: I90ad197811ebabceb5b5d74d6d3f20716fbe2d45
* | | | am 9f1b9bb7: (-s ours) am 5e7b21bb: Merge "build: wildcard isn\'t guaranteed ↵Dan Willemsen2015-08-270-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | to be sorted" * commit '9f1b9bb71019b9a773d847cec6f10c198cd6c459':
| * | | am 5e7b21bb: Merge "build: wildcard isn\'t guaranteed to be sorted"Dan Willemsen2015-08-121-9/+9
| |\ \ \ | | |/ / | |/| | | | | | | | | | * commit '5e7b21bb954dcf74533a1725be62cf6bffcb34ce': build: wildcard isn't guaranteed to be sorted
* | | | am 5e7b21bb: Merge "build: wildcard isn\'t guaranteed to be sorted"Dan Willemsen2015-08-121-9/+9
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '5e7b21bb954dcf74533a1725be62cf6bffcb34ce': build: wildcard isn't guaranteed to be sorted
| * | Merge "build: wildcard isn't guaranteed to be sorted"Dan Willemsen2015-08-121-9/+9
| |\ \
| | * | build: wildcard isn't guaranteed to be sortedDan Willemsen2015-08-071-9/+9
| |/ / | | | | | | | | | | | | | | | To prevent this from changing between builds, wrap in $(sort ) Change-Id: I0571d7d8787a40ca107c7c735d79692d27bed06e
* | | am f2df045a: Merge commit \'10d211b84a5f0790b28fcc8b3db66884d5f9c729\' into HEADBill Yi2015-02-200-0/+0
|\| | | | | | | | | | | * commit 'f2df045ae92ee655481f73b19986084308ae684c':
| * | Merge commit '10d211b84a5f0790b28fcc8b3db66884d5f9c729' into HEADBill Yi2015-02-190-0/+0
| |\ \
* | | | am 2b6bf8dc: Merge "Do not include genericStds_linux.cpp."Chih-Hung Hsieh2015-02-182-3/+1
|\| | | | |/ / |/| | | | | | | | * commit '2b6bf8dc0941f3a4531030b950cf24fd31248b0b': Do not include genericStds_linux.cpp.
| * | Merge "Do not include genericStds_linux.cpp."Chih-Hung Hsieh2015-02-182-3/+1
| |\ \
| | * | Do not include genericStds_linux.cpp.Chih-Hung Hsieh2015-02-122-3/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The __aeabi_memcpy functions are already defined in Android libc. Redefining them to call memcpy will become recursive when clang/llvm converts the memcpy call to __aeabi_memcpy. With this change, we can enable clang/llvm by removing LOCAL_CLANG from Android.mk. BUG: 12216385 Change-Id: I8b8b4ba7f3ff1e66f8110fc3b6356865a582c1d8
* | | am 1c6ab7db: Merge "Use gcc for the AAC decoder"Marco Nelissen2015-02-111-0/+2
|\| | | | | | | | | | | | | | * commit '1c6ab7db30867f3eee0d550adb015b340fbbc668': Use gcc for the AAC decoder
| * | Merge "Use gcc for the AAC decoder"Marco Nelissen2015-02-111-0/+2
| |\ \
| | * | Use gcc for the AAC decoderMarco Nelissen2015-02-101-0/+2
| |/ / | | | | | | | | | | | | | | | clang generates crashing code for this. Change-Id: I90355d6735403290e7c0d93ff4854520b7b80f4a
* | | am 66091e46: Merge "Fix checks for {Front,Side,Back}ElementIsCpe"Chih-Hung Hsieh2014-12-012-7/+3
|\| | | | | | | | | | | | | | * commit '66091e46d7aae1b45ed96f5f39274954a296db71': Fix checks for {Front,Side,Back}ElementIsCpe
| * | Merge "Fix checks for {Front,Side,Back}ElementIsCpe"Chih-Hung Hsieh2014-12-012-7/+3
| |\ \
| | * | Fix checks for {Front,Side,Back}ElementIsCpeChih-Hung Hsieh2014-12-012-7/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | {Front,Side,Back}ElementIsCpe is an array (per-channel). The check for pPce->{Front,Side,Back}ElementIsCpe without an index checks the address of the array, and will always evaluate to true. The elTagSce++ statements are unreachable. Change-Id: If530371788a44038c500d6f9f7ac67681f77cc71
* | | am 84851b23: Merge "Move back to C++98."Dan Albert2014-12-011-1/+2
|\| | | | | | | | | | | | | | * commit '84851b23d6f65ce03da4fa8ef2348b4f46c0ed0f': Move back to C++98.
| * | Merge "Move back to C++98."Dan Albert2014-12-011-1/+2
| |\ \
| | * | Move back to C++98.Dan Albert2014-11-281-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | This code depends on narrowing hex literals to a signed long, which trips -Wc++11-narrowing (the fix would be to explicitly cast each value to signed). Change-Id: I581a02ef0eeee5a2d95ce0ff2ec6f7ff26f3a074
* | | am d149516e: am 7e464956: Merge "Move Clang only flags into ↵Chih-Hung Hsieh2014-10-250-0/+0
|\| | | | | | | | | | | | | | | | | LOCAL_CLANG_CPPFLAGS." * commit 'd149516e1a3a63549d2c654b1398544d5de46a3e':
| * | am 7e464956: Merge "Move Clang only flags into LOCAL_CLANG_CPPFLAGS."Chih-Hung Hsieh2014-09-231-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '7e46495606bd66973a10565f932acee7bddcc003': Move Clang only flags into LOCAL_CLANG_CPPFLAGS.
* | \ \ am 7e464956: Merge "Move Clang only flags into LOCAL_CLANG_CPPFLAGS."Chih-Hung Hsieh2014-09-231-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '7e46495606bd66973a10565f932acee7bddcc003': Move Clang only flags into LOCAL_CLANG_CPPFLAGS.
| * | Merge "Move Clang only flags into LOCAL_CLANG_CPPFLAGS."Chih-Hung Hsieh2014-09-231-1/+1
| |\ \
| | * | Move Clang only flags into LOCAL_CLANG_CPPFLAGS.Chih-Hung Hsieh2014-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Gcc does not recognize -Wno-pointer-bool-conversion. Change-Id: Ib6ffa321fff1947b6a098244f7d67fdeb45c2b41
* | | | am 4803bf75: Merge "Ignore Clang warning on checking address of arrays."Glenn Kasten2014-09-091-0/+5
|\| | | | | | | | | | | | | | | | | | | * commit '4803bf75f564e5c9304527a5b902711f78e9f621': Ignore Clang warning on checking address of arrays.
| * | | Merge "Ignore Clang warning on checking address of arrays."Glenn Kasten2014-09-091-0/+5
| |\| |
| | * | Ignore Clang warning on checking address of arrays.Chih-Hung Hsieh2014-09-031-0/+5
| |/ / | | | | | | | | | | | | BUG: 17356808 Change-Id: I464ffcfb3fc4f44ac8115f9ae98a8c46189b41cd
* | / am 2decc778: Merge "[MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6"Keun-young Park2014-08-142-2/+2
|\| | | |/ |/| | | | | * commit '2decc77814e729df47464a504123f9b398ac7077': [MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6
| * Merge "[MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6"Keun-young Park2014-08-142-2/+2
| |\
| | * [MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6Duane Sand2014-07-312-2/+2
| |/ | | | | | | Change-Id: I3dacd96cf9d5cf9c3d34d612ebb0456d64bc23bc