aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Change build config of aac from Android.mk to Android.bp" am: ↵Pavlin Radoslavov2017-01-202-59/+32
|\ | | | | | | | | | | | | | | 8334e4b410 am: 2eba55c5a8 am: 1679274c9c am: 4910e5a352 Change-Id: I06e73ca6768323110b658548a189a1f69695cc08
| * Merge "Change build config of aac from Android.mk to Android.bp" am: ↵Pavlin Radoslavov2017-01-202-59/+32
| |\ | | | | | | | | | | | | | | | | | | | | | 8334e4b410 am: 2eba55c5a8 am: 1679274c9c Change-Id: I17c2d7f5c558e17fc4b579d879160f4d6a6ce587
| | * Merge "Change build config of aac from Android.mk to Android.bp" am: 8334e4b410Pavlin Radoslavov2017-01-202-59/+32
| | |\ | | | | | | | | | | | | | | | | | | | | am: 2eba55c5a8 Change-Id: I16c8e041daad6f21dd80ec50db52ae488f1b91c5
| | | * Merge "Change build config of aac from Android.mk to Android.bp"Pavlin Radoslavov2017-01-202-59/+32
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: 8334e4b410 Change-Id: I770984561bf97b52e50c83844f4037fccabfdedc
| | | | * Merge "Change build config of aac from Android.mk to Android.bp"Treehugger Robot2017-01-202-59/+32
| | | |/|
| | | | * Change build config of aac from Android.mk to Android.bpPavlin Radoslavov2017-01-192-59/+32
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * In an effort to modernize build configurations to the new Soong system, we need to upgrade existing Android.mk files to Android.bp * This file is done by using the following steps: 1. Manually removing all *_sources from Android.mk, because of the unusual make logic they use 2. Running the auto-conversion tool: androidmk Android.mk > Android.bp 3. Editing the result Android.bp: 3.1. Writing the "srcs" list 3.2. Removing the escaping around -Wno-#warnings in cflags, because those are not needed anymore 3.3. Renamed local_include_dirs to export_include_dirs to facilititate the inclusion of header files. It appears users of libFraunhoferAAC are using header files from all include directories, hence the renaming. Test: Code compilation ("mm" in external/aac, and "make" in top-directory) Bug: b/32958753 b/34454142 Change-Id: Ie89f73722908e8734f4b88f1407952311ec064af
* | | | Merge "Remove redundant register storage class specifiers" am: ed91226cec ↵Martin Storsjo2016-10-282-9/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 664e5f2794 am: bfba552d9e am: de03facdb2 Change-Id: Iaeb5b599896e4c640b8902c26cc6e3f7405a1256
| * | | Merge "Remove redundant register storage class specifiers" am: ed91226cec ↵Martin Storsjo2016-10-282-9/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 664e5f2794 am: bfba552d9e Change-Id: I02d87c067cdcea95ce7ee207da15bf85d5a21e89
| | * | Merge "Remove redundant register storage class specifiers" am: ed91226cecMartin Storsjo2016-10-282-9/+9
| |/| | | | |/ | | | | | | | | | | | | am: 664e5f2794 Change-Id: I9d17d79e37bac378e853d6102b26a8c354790957
| | * Merge "Remove redundant register storage class specifiers"Martin Storsjo2016-10-282-9/+9
| | |\ | | | | | | | | | | | | | | | | | | | | am: ed91226cec Change-Id: Ieb0f6090190d7cd2d21599f9b1e6ce950608313d
| | | * Merge "Remove redundant register storage class specifiers"Treehugger Robot2016-10-282-9/+9
| | | |\
| | | | * Remove redundant register storage class specifiersMartin Storsjo2016-10-182-9/+9
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang warns about this being deprecated, when building without specifying -std=c++98. This doesn't give any measurable encoding speed impact on ARM or AArch64, on neither GCC nor Clang. Change-Id: I63a0bbd1dccb97547522da188ee585d4d8127c29
* | | | Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8 am: 515fb25ef7Martin Storsjo2016-10-184-30/+28
|\| | | | | | | | | | | | | | | | | | | | | | | am: 8124c22bb7 Change-Id: I49295c5d3cba3a7f97c9d9494df59f460c2c195a
| * | | Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8Martin Storsjo2016-10-184-30/+28
| |\| | | | | | | | | | | | | | | | | | | | | | am: 515fb25ef7 Change-Id: Ic97d0e64efee960f87b2cb7581666b2af05873cd
| | * | Merge "Add casts to avoid errors due to narrowing"Martin Storsjo2016-10-184-30/+28
| |/| | | | |/ | | | | | | | | | | | | am: 4556cb9cb8 Change-Id: I4cb4a7dace03c7c09403588da05ea8df0f35077e
| | * Merge "Add casts to avoid errors due to narrowing"Treehugger Robot2016-10-184-30/+28
| | |\
| | | * Add casts to avoid errors due to narrowingMartin Storsjo2016-10-174-30/+28
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes building in C++11 mode, which normally errors out on narrowing hex literals to signed long. This is similar to what was done in git commit ef30836651 (change id I64d19a8a8059c5a96386b1eaac297fd2469515f8), completing the fix for that category of issues. Change-Id: I1907bc947d43bf44910fb2b34bf2b31c0e53aa53
* | | Merge "Avoid a warning about extra parentheses" am: f935254cc9 am: ↵Jean-Michel Trivi2016-09-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | 899335d310 am: 79c3cd8b1a am: ca6ae4ffe4 Change-Id: Ia6bbf7532c0058ae716f6243fadf66b032fd7e7b
| * | Merge "Avoid a warning about extra parentheses" am: f935254cc9 am: 899335d310Jean-Michel Trivi2016-09-091-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | am: 79c3cd8b1a Change-Id: Ia7a3b896268f11c5c2003c36aa38724910b08db0
| | * \ Merge "Avoid a warning about extra parentheses" am: f935254cc9Jean-Michel Trivi2016-09-091-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 899335d310 Change-Id: Iff4192d216e3ebeed98bf37d76b892be391ffa02
| | | * | Merge "Avoid a warning about extra parentheses"Jean-Michel Trivi2016-09-091-1/+1
| | |/| | | | | |/ | | | | | | | | | | | | | | | | am: f935254cc9 Change-Id: I838bc99ee6450cdf300663f3a1c356e5cacf517f
| | | * Merge "Avoid a warning about extra parentheses"Jean-Michel Trivi2016-09-091-1/+1
| | |/|
| | | * Avoid a warning about extra parenthesesMartin Storsjo2016-08-301-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following warning: libSBRenc/src/sbr_encoder.cpp:1942:14: warning: equality comparison with extraneous parentheses [-Wparentheses-equality] Change-Id: I2c833d19348574473c752076a4efff6642c0d653
* | | Fix build warningGlenn Kasten2016-08-231-1/+1
| | | | | | | | | | | | | | | Bug: 28026175 Change-Id: Ie8d84f694fcb788e5fb8780b11fa07bb98097ce0
* | | Remove redundant parentheses around == comparison operatorGlenn Kasten2016-08-161-1/+1
| | | | | | | | | | | | | | | Bug: 28026175 Change-Id: I61be1ab98d7279d09250ea4b810c5f31886da048
* | | Merge "Disable warnings that are not easily fixable" am: 8192b1a am: 2a923c9 ↵Glenn Kasten2016-04-201-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 00fc1c6 am: fb66dce * commit 'fb66dceae5e856648073138305ea59cc4eabf26e': Disable warnings that are not easily fixable Change-Id: I357fd4fd9aa8400c982959a8041d5c243eb3c430
| * | Merge "Disable warnings that are not easily fixable" am: 8192b1a am: 2a923c9Glenn Kasten2016-04-201-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | am: 00fc1c6 * commit '00fc1c66d5a524c6961db04d05e1076b18003231': Disable warnings that are not easily fixable Change-Id: Id64b163cd217ad1cbb209843819416f3a8b354b1
| | * Merge "Disable warnings that are not easily fixable" am: 8192b1aGlenn Kasten2016-04-201-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2a923c9 * commit '2a923c92869efb277ca7d67ab6c27617ec26c128': Disable warnings that are not easily fixable Change-Id: I920b16bdaa1ce7a00c91e129b950f0d486a1fa37
| | | * 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" am: 9d0179c ↵Glenn Kasten2016-04-201-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 27625f2 am: c3f7cf7 am: 0d9ca2d * commit '0d9ca2d051526199e875bcddeb8e8008872188a0': Add default case for undefined pointer initialization Change-Id: If945c473d032adaf2ea548978424b466c7dbed7c
| * | | | | Merge "Add default case for undefined pointer initialization" am: 9d0179c ↵Glenn Kasten2016-04-201-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 27625f2 am: c3f7cf7 * commit 'c3f7cf7f1b8987a873ceea8c1b45206dd611e425': Add default case for undefined pointer initialization Change-Id: I11a5787070f3be7f2d476ec1ebd54c1d41ce7dc2
| | * | | | Merge "Add default case for undefined pointer initialization" am: 9d0179cGlenn Kasten2016-04-201-0/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 27625f2 * commit '27625f27066421ce38250272f4bb751cf6f58c17': Add default case for undefined pointer initialization Change-Id: I601dc2afdfa8db2008628e05068d277a617c022d
| | | * | | 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" am: 6ae5480 am: 2b2e97b am: ↵Glenn Kasten2016-04-201-25/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e34e2b9 am: e95a3bd * commit 'e95a3bd58f2a6e7a67cd22d5dcea44c36024bea2': Left shift of negative int is undefined Change-Id: I6cbd95e96a9ad60273d4b48a6db425c636c33b77
| * | | | | Merge "Left shift of negative int is undefined" am: 6ae5480 am: 2b2e97bGlenn Kasten2016-04-201-25/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e34e2b9 * commit 'e34e2b9d54680b7d59104b8398d10f6d4d8c5be6': Left shift of negative int is undefined Change-Id: Ic539e64d4cf654b3e8924d6321ac203f4f355a96
| | * | | | Merge "Left shift of negative int is undefined" am: 6ae5480Glenn Kasten2016-04-201-25/+25
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2b2e97b * commit '2b2e97b893b16b69c7728d16e8653b9c94944294': Left shift of negative int is undefined Change-Id: Ie90b850b7adf787dfb47f8b7c43a22744c3a7fa0
| | | * | | 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
* | | | | | resolve merge conflicts of ad1e898 to nyc-dev-plus-aosp am: 2809968Glenn Kasten2016-04-204-7/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 18a9bb8 * commit '18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc': Remove redundant parentheses around == comparison operator Change-Id: If91ecced946588a7d6f48aab5a90e0e8503793b1
| * | | | | resolve merge conflicts of ad1e898 to nyc-dev-plus-aospGlenn Kasten2016-04-204-7/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2809968 * commit '28099687b733eac90cff9273b6f8f660176e0784': Remove redundant parentheses around == comparison operator Change-Id: I87566357ee932ac57eed79645fec146625c85cdb
| | * | | | resolve merge conflicts of ad1e898 to nyc-dev-plus-aospGlenn Kasten2016-04-204-7/+6
| | |\| | | | | | | | | | | | | | | | | | | | | Change-Id: If143807a233d47fb7fd269fd263a8a898109b060
| | | * | | 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
* | | | Merge "Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: ↵Jean-Michel Trivi2016-04-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01 am: 0cf3a7671a am: 9d4702f2d9 am: 9000e05228" into nyc-mr1-dev-plus-aosp am: 268c63c4a5 * commit '268c63c4a5c0152e35a76d1f18a9a80978e7b7c4': Change-Id: I30af010261c093ffc9ca92e15df725394de301ba
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 17:32:36 +0000