aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Improve code coverage for aac_dec_fuzzerS Vasudev Prasad2020-06-191-5/+61
| | | | | | | Test: ./aac_dec_fuzzer Bug: 158206619 Change-Id: I42d57ec832dbd273f66ce149ce81bfcb1c514add
* Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796Treehugger Robot2020-05-211-1/+1
|\ | | | | | | Change-Id: If0646e3c2b9b9927a58811606fff28e432e6d303
| * Merge "Fix license type s/b BY_EXCEPTION_ONLY"Treehugger Robot2020-05-211-1/+1
| |\
| | * Fix license type s/b BY_EXCEPTION_ONLYBob Badour2020-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | The Fraunhofer license has special requirements. Test: no code change Change-Id: I439354498c0a28d6ff078cea9a4f8e9bfc02145f
* | | Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06Kris Alder2020-05-211-0/+7
|\| | | | | | | | | | | Change-Id: I9cc973e862cfa58047cd1056488f64de4bf07abb
| * | Merge "Added fuzz_config field in aac_dec_fuzzer"Kris Alder2020-05-211-0/+7
| |\ \ | | |/ | |/|
| | * Added fuzz_config field in aac_dec_fuzzerAyushi Khopkar2020-05-191-0/+7
| |/ | | | | | | | | | | | | Test: ./aac_dec_fuzzer Bug: 156871294 Change-Id: Idfc93a6f6c71a78c2b7759443161d8e75dfc4670
* | Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4aTreehugger Robot2020-05-041-0/+3
|\| | | | | | | Change-Id: Ie009da3fed10417d87afd65c4097d8ac58954ec6
| * Merge "Add METADATA to aac: Apache2=NOTICE"Treehugger Robot2020-05-041-0/+3
| |\
| | * Add METADATA to aac: Apache2=NOTICEBob Badour2020-04-281-0/+3
| |/ | | | | | | | | | | | | | | | | Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I71f5c419c31c1758d4ee49158d40a50aef6abf5d
* | Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1dTreehugger Robot2020-04-221-5/+12
|\| | | | | | | Change-Id: I9e18b0e6a5e919b0346d0edad0c4e12e763c49fa
| * Merge "Set min_sdk_version to be part of mainline modules"Treehugger Robot2020-04-221-5/+12
| |\
| | * Set min_sdk_version to be part of mainline modulesJooyung Han2020-04-231-5/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Change-Id: I662ad951a3221f967b53e7af65cb203a4b4a5e5d
* | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
|\ \ | | | | | | | | | | | | Bug: 151763422 Change-Id: I15ed3fefee5678a9ab83f52fc0c4d4d3dd9dbcaf
| * \ Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400 am: 0b8c6e731fKris Alder2020-04-0915-11/+201
| |\ \ | |/ / |/| | | | | Change-Id: I102fd257b225a51cd4d4c9e3205b12bb21a2e532
* | | Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400Kris Alder2020-04-0915-11/+201
|\ \ \ | |/ / |/| / | |/ Change-Id: Id2c7f9213d42db6897c3d8cc1fd14c0126fb8bb1
| * Merge changes Iad37ae76,I4870251b,Icd937cadKris Alder2020-04-0915-11/+201
|/| | | | | | | | | | | | | * changes: Added aac_dec_fuzzer aacdec: Add host support Stop using __DATE__/__TIME__ on all builds
| * Added aac_dec_fuzzerAnuj Joshi2020-03-273-0/+182
| | | | | | | | | | | | | | Test: ./aac_dec_fuzzer Bug: 151595970 Change-Id: Iad37ae766288e9490520d858a6de0dd755e70681
| * aacdec: Add host supportAnuj Joshi2020-03-271-0/+7
| | | | | | | | | | | | | | Test: Build libFraunhoferAAC on host Bug: 151595970 Change-Id: I4870251b6fe2143dca6b5eed9c2643705c63952c
| * Stop using __DATE__/__TIME__ on all buildsAnuj Joshi2020-03-2712-11/+12
|/ | | | | | | Test: mmma external/libaac Bug: 151595970 Change-Id: Icd937cad3e4e2f70a5486cca424544eb410be26f
* DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li2019-10-300-0/+0
|\ | | | | | | | | | | | | | | stage-aosp-master am: 7ea2e46dc1 Change-Id: I580bebbf6a96c5ef6dfbb8e691917c16207551bb
| * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li2019-10-300-0/+0
| |\ | |/ |/| | | | | | | | | stage-aosp-master Bug: 142003500 Change-Id: I809fba949d51f01395793ccb36118e4f5c42e5be
* | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 09dc9b073f -s ours am: 7fc6e3f8ff -s ours am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1 a209adb315 is in history Change-Id: I67e58e13c18499f1fdcd5b6b72b8afce257a22f7
| * | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 09dc9b073f -s ours am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1 a209adb315 is in history Change-Id: I921ce87ed814fc4b8ff3977e3b5fefa796e872f2
| | * Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | No content change. Bug: 135460123 Change-Id: I058d0d709bb7752aa276e0047d2e0b81403ee5fc Merged-In: I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c
* | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li2019-09-050-0/+0
|\| | | | |_|/ |/| | | | | | | | | | | | | | | | | d929f68a05 -s ours am: 5d3d55e2c7 am: 35b1ada3b4 Change-Id: I735bbaf8236207a00fb745c8e57a04c77b76b432
| * | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li2019-09-050-0/+0
|/| | | | | | | | | | | | | | | | | | | | | | | d929f68a05 -s ours am: 5d3d55e2c7 Change-Id: I0ada3904a4004089fdfdb43966288c019cf58d8c
| * | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li2019-09-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | am: d929f68a05 -s ours am skip reason: subject contains skip directive Change-Id: Iabc2e26ef91b10d03f213fa1a694cb921ca4c1bb
| | * Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li2019-09-0532-1352/+4643
| | |\
| | | * DO NOT MERGE - Merge Android 10 into masterXin Li2019-09-0432-1352/+4643
| | |/| | | | | | | | | | | | | | | | | Bug: 139893257 Change-Id: I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c
* | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master" am: c2eb64586d -s ours am: 6266103519 -s ours am: bf68b4972f Change-Id: I05880e6e76d61b683b55364726e841097f130a16
| * | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master" am: c2eb64586d -s ours am: 6266103519 -s ours am skip reason: subject contains skip directive Change-Id: I69945c03e154530e7d917f1de7f0669480715686
| | * | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master" am: c2eb64586d -s ours am skip reason: subject contains skip directive Change-Id: I637c44703fdee4aff09ea97fe2dce5c8395a2c63
| | | * Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"Xin Li2019-07-090-0/+0
| | | |\
* | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master am: 569027011c -s ours am: 506ae97bee -s ours am: 50d8447d97 Change-Id: Ifb01dd1cbab4f450563f31f93c19dad5bf079404
| * | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master am: 569027011c -s ours am: 506ae97bee -s ours am skip reason: subject contains skip directive Change-Id: I715b40974bbd1381f7b72c0ee399fe4214444a0d
| | * | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| |/| | | | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master am: 569027011c -s ours am skip reason: subject contains skip directive Change-Id: I5aecc5cecde457bbfa6a076c68bd0b14bfa5da3f
| | * | DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into masterXin Li2019-07-090-0/+0
| | |\ \ | | | |/ | | |/| | | | | | | | | Bug: 136196576 Change-Id: Ibab15539f2fd0081ef9f8e1a607461d5238c9a88
| | | * Snap for 5622519 from 81b3f635622cda59f93cc13edf0621da064bc072 to ↵android-build-team Robot2019-07-080-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I2fa7ee95d121ad53fd5e3cc445b83fbeb7bb2d66
| | | | * Snap for 5526913 from b81f869de3f7c5b6395606d5f36cef57987eae8f to ↵android-build-team Robot2019-05-030-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-b-release Change-Id: I15a91b27f0bcef3b820d665017fa8d4d105ee33d
| | | | * \ Merge cherrypicks of [7070078, 7070079, 7070080, 7070608, 7069857, 7069858, ↵android-build-team Robot2019-04-161-0/+8
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7069859, 7070136, 7070137, 7070138, 7071045, 7071046, 7071047, 7071048, 7070081, 7070863, 7070082, 7069862, 7069863, 7069864, 7071085, 7070118] into pi-qpr3-b-release Change-Id: I253904631907415999bad3cbcd4259896b8a3844
| | | | | * | Add sanity check in huff_decode()Fraunhofer IIS FDK2019-04-161-0/+8
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Bug: 119292397 Change-Id: I33e99629665df9aa6262c90dd7ebdde4b4b9d773 (cherry picked from commit b81f869de3f7c5b6395606d5f36cef57987eae8f)
| | | | * | Snap for 5447620 from 69514bb3082c0f26a3684501240c982b79ecc22b to ↵android-build-team Robot2019-04-161-8/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-b-release Change-Id: I85690855119d1d87f317117f7454b99a1353a388
| | | | * \ \ Merge cherrypicks of [7068682, 7066360, 7066361, 7066362, 7068985, 7068986, ↵android-build-team Robot2019-04-161-0/+8
| | | | |\ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | 7068987, 7068800, 7068004] into pi-qpr3-b-release Change-Id: I779161184ff3f9875b815efe88c9d12e046879e8
| | | | | * | Add sanity check in huff_decode()Fraunhofer IIS FDK2019-04-161-0/+8
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Bug: 119292397 Change-Id: I33e99629665df9aa6262c90dd7ebdde4b4b9d773 (cherry picked from commit b81f869de3f7c5b6395606d5f36cef57987eae8f)
* | | | | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li2019-07-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 4d56b880e2 Change-Id: Ida7e07f2d981f3df794171aba9385dcc691f43c8
| * | | | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li2019-07-0132-1352/+4643
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 134405016 Change-Id: I30ab93ed5c2fa3c47306058d1a0f749b8101b01e
* | \ \ \ \ \ [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-06-100-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into master" am: b018de371d -s ours am: c10b5daa8d -s ours am: 058d1295f4 Change-Id: Icf8cfab1834934bd73b2d7cefdfcffc3ac225dc6
| * | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-06-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into master" am: b018de371d -s ours am: c10b5daa8d -s ours am skip reason: subject contains skip directive Change-Id: Ia1d6cf99beb6ee823b4e188c59025139db431f02
| | * | | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-06-100-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into master" am: b018de371d -s ours am skip reason: subject contains skip directive Change-Id: Iacff6609b76e136716228b61a989a4a81b051c4f
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 22:11:29 +0000