aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Bob Badour
3a930cc474 am: efc77b356b am: dc32830263 Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1588694 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0a8b0e6dd5252a5c58bbbcbeefa762a201ab7d09
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" am: ↵Bob Badour
3a930cc474 am: efc77b356b Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1588694 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic4491ed6c3c41ec571b27e56994858a427b13b2e
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" am: 3a930cc474android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1588694 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id3222d1f0d38a06b4f7e9982d927661fce76bb41
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompressBob Badour
Added SPDX-license-identifier-BSD to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I19d055d78a2c9227c8c521b65d3ff52efc591eca
2021-01-15[automerger skipped] Merge changes I3084f1e2,I7ea6a7bb,I71f588b9 am: ↵Eric Laurent
8bf575a845 am: 11cd3180a5 am: 107425320c -s ours am skip reason: Change-Id I3084f1e294d15a12923958af9170f00413fae2bb with SHA-1 533365793d is in history Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551056 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I58b29a942dcecb691921762868339327f8d32fa1
2021-01-15[automerger skipped] tinycompress: Fix error handling in plugins. am: ↵Vidyakumar Athota
fc8976c893 am: 961c9afd6b am: b45e6a49fe -s ours am skip reason: Change-Id I7ea6a7bb712367546607b8d7985cc4de8ca2455f with SHA-1 f86d1a2e03 is in history Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551055 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I565780238089c4d06121308e22aa75eb89aabd9d
2021-01-15[automerger skipped] external: tinycompress: add support for compress ↵Vidyakumar Athota
plugins am: 2b8db68d31 am: 93ef2fc37e am: b2de43cbb5 -s ours am skip reason: Change-Id I71f588b9ed84b62d3b1b08dae7ce65f8fa649e6a with SHA-1 931e7cf24b is in history Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551054 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I712fee58aafd59eff290c5a07b702eb051c31191
2021-01-15Merge changes I3084f1e2,I7ea6a7bb,I71f588b9 am: 8bf575a845 am: 11cd3180a5Eric Laurent
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551056 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I64897a55b9c9759af84f50be737d107915408e0b
2021-01-15tinycompress: Fix error handling in plugins. am: fc8976c893 am: 961c9afd6bVidyakumar Athota
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551055 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I19206f006ba5de110af0edf66b501b8bb15867e8
2021-01-15external: tinycompress: add support for compress plugins am: 2b8db68d31 am: ↵Vidyakumar Athota
93ef2fc37e Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551054 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2f45e92010dff2ac1504ac11f8318862474e31a4
2021-01-15Merge changes I3084f1e2,I7ea6a7bb,I71f588b9 am: 8bf575a845Eric Laurent
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551056 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib472495de7591bd275fe7e359ed76db991389907
2021-01-15tinycompress: Fix error handling in plugins. am: fc8976c893Vidyakumar Athota
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551055 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7ac79de119bcd9d9832d852730b3de960c815e49
2021-01-15external: tinycompress: add support for compress plugins am: 2b8db68d31Vidyakumar Athota
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551054 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic328a6cc70625d9163082c39fc251e524aa409cc
2021-01-15Merge changes I3084f1e2,I7ea6a7bb,I71f588b9Eric Laurent
* changes: fix build tinycompress: Fix error handling in plugins. external: tinycompress: add support for compress plugins
2021-01-14Merge "update OWNERS" am: b15cd11aa6 am: 510c32de34 am: f5e92449a1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1550784 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia1da28e9a2862f0058a1341f07ebebadc6151407
2021-01-14Merge "update OWNERS" am: b15cd11aa6 am: 510c32de34Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1550784 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib5f4a607834761a3b5da436e63b741fc6f5fb218
2021-01-14Merge "update OWNERS" am: b15cd11aa6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1550784 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I710cedd0cf0ba8ac26983eb4b455dfea7447a611
2021-01-14fix buildEric Laurent
Fix build breakage introduced by commit f86d1a2e with strlcpy argument checks. Test: make checkbuild Change-Id: I3084f1e294d15a12923958af9170f00413fae2bb Merged-In: I3084f1e294d15a12923958af9170f00413fae2bb
2021-01-14tinycompress: Fix error handling in plugins.Vidyakumar Athota
Bug: 166667071 Test: manual offload playback Test: cts AudioTrackOffloadTest CRs-Fixed: 2608556 Change-Id: I7ea6a7bb712367546607b8d7985cc4de8ca2455f Merged-In: I7ea6a7bb712367546607b8d7985cc4de8ca2455f
2021-01-14external: tinycompress: add support for compress pluginsVidyakumar Athota
Add plugin support to use vendor specific compress implementation Bug: 166667071 Test: manual offload playback test Test: cts AudioTrackOffloadTest CRs-Fixed: 2563258 Change-Id: I71f588b9ed84b62d3b1b08dae7ce65f8fa649e6a Merged-In: I71f588b9ed84b62d3b1b08dae7ce65f8fa649e6a
2021-01-14Merge "update OWNERS"Treehugger Robot
2021-01-14update OWNERSEric Laurent
Test: make Change-Id: Ifd2b023b9dcc7efee7528908b803a6882654ec54
2021-01-13fix buildEric Laurent
Fix build breakage introduced by commit f86d1a2e with strlcpy argument checks. Test: make checkbuild Change-Id: I3084f1e294d15a12923958af9170f00413fae2bb
2021-01-13Revert "Revert "tinycompress: Fix error handling in plugins.""Eric Laurent
This reverts commit d655935a89e1474d99eb18a8e2bc1a066e1734bf. Test: make Change-Id: I95016c6e542de7e3bcba4a239ec2765b841dcfc5
2021-01-13Revert "tinycompress: Fix error handling in plugins."Eric Laurent
This reverts commit f86d1a2e03fcc6876d7f0e27e2a2f394963b7ae2. Reason for revert: b/177399104 Change-Id: I672a5f667918df3d2ffdf43cd152d710c7806555
2020-12-10tinycompress: Fix error handling in plugins.Vidyakumar Athota
Bug: 166667071 Test: manual offload playback Test: cts AudioTrackOffloadTest CRs-Fixed: 2608556 Change-Id: I7ea6a7bb712367546607b8d7985cc4de8ca2455f
2020-12-10external: tinycompress: add support for compress pluginsVidyakumar Athota
Add plugin support to use vendor specific compress implementation Bug: 166667071 Test: manual offload playback test Test: cts AudioTrackOffloadTest CRs-Fixed: 2563258 Change-Id: I71f588b9ed84b62d3b1b08dae7ce65f8fa649e6a
2020-05-05Merge "Add METADATA to tinycompress: BSD+Apache2=NOTICE" am: c67917c054 am: ↵Treehugger Robot
f7b937d32d am: f8aef8a8cd am: cd8f58f5a7 am: fb35294759 Change-Id: I7aa7fb2886a7378651778d801486b4f2eccd25e5
2020-05-05Merge "Add METADATA to tinycompress: BSD+Apache2=NOTICE" am: c67917c054 am: ↵Treehugger Robot
f7b937d32d am: f8aef8a8cd am: cd8f58f5a7 Change-Id: Ib0dd034352ce71bf763cd61cb1d7c4f72611e522
2020-05-05Merge "Add METADATA to tinycompress: BSD+Apache2=NOTICE" am: c67917c054 am: ↵Treehugger Robot
f7b937d32d am: f8aef8a8cd Change-Id: I5b9ccef1776ec82a3149e25f93977a9c224aa728
2020-05-05Merge "Add METADATA to tinycompress: BSD+Apache2=NOTICE" am: c67917c054 am: ↵Treehugger Robot
f7b937d32d Change-Id: I41968e3eed821160f491271b1ac4cebb5a747377
2020-05-05Merge "Add METADATA to tinycompress: BSD+Apache2=NOTICE" am: c67917c054android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: If7f6d4779070539ddfa9735af5d4c538fd12b06c
2020-05-05Merge "Add METADATA to tinycompress: BSD+Apache2=NOTICE"Treehugger Robot
2020-05-05Add METADATA to tinycompress: BSD+Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Exempt-From-Owner-Approval: janitorial work Change-Id: I99ecc0ab59dd7e1ba61a6d4e41274f9289c6eb6e
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 65450e5be4 am: 0d22775e99 -s ours am skip reason: subject contains skip directive Change-Id: Ifbf421ee8a3e07f760e3311b36b67750fff2e21b
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 65450e5be4 Change-Id: I26ef047ba9a503aa8c5ebe057e95954aaf33c396
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I2708a14e53513cbfb09c9272ccb478634bdad2ab
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: b0e3446028 -s ours am: bd6e32c578 -s ours am: 6a1367ef9e -s ours am skip reason: change_id I9d37ecefcc91ebab3bc798d0deed9e924ca828d3 with SHA1 9b99e6a8ea is in history Change-Id: Ib40a4a0ccc62bca1733a4855e6123def982ed210
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: b0e3446028 -s ours am: bd6e32c578 -s ours am skip reason: change_id I9d37ecefcc91ebab3bc798d0deed9e924ca828d3 with SHA1 9b99e6a8ea is in history Change-Id: Icef0efbb3fea71bc4060609783c414995c59b927
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: b0e3446028 -s ours am skip reason: change_id I9d37ecefcc91ebab3bc798d0deed9e924ca828d3 with SHA1 9b99e6a8ea is in history Change-Id: I4627986fb183fc78e9fdb2ef60ca6a0d334fb816
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: Idb8d81be9d9877ab4796229229adfb52178f448b Merged-In: I9d37ecefcc91ebab3bc798d0deed9e924ca828d3
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
fcc17e5d0e -s ours am: 7b5e767755 am: be6af9bbc7 am: 46d10e2e12 -s ours am skip reason: subject contains skip directive Change-Id: Id1c118807011a076bb92a5ba585baaaaa0d90e32
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
fcc17e5d0e -s ours am: 7b5e767755 am: be6af9bbc7 Change-Id: Id43e2fc5dedb2cb3815e11ba2b3de4455a0e8270
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
fcc17e5d0e -s ours am: 7b5e767755 Change-Id: Ic137144bbf76eb74b450d85de7cc18c6045b039f
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: fcc17e5d0e -s ours am skip reason: subject contains skip directive Change-Id: I0cb4b6eee32488906c931102709f17ccd8612521
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I9d37ecefcc91ebab3bc798d0deed9e924ca828d3
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 9206e29312 am: 3f2e666567 -s ours am skip reason: subject contains skip directive Change-Id: I3c0e4763b6eb841b59e16bbab88e586e0fd6e774
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 9206e29312 Change-Id: I64079057c20c568597db0f9890121a8ae515754b
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 16:38:51 +0000