aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-27Set min_sdk_version to be part of mainline modules am: edabab205c am: 3087a6b713android-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_r18android11-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-d2-releaseJooyung Han
Change-Id: Ib0870e40af937a020a4b2dbefbc5b73c3810f483
2020-04-27Set min_sdk_version to be part of mainline modules am: edabab205candroid-11.0.0_r16android11-d1-b-releaseJooyung Han
Change-Id: I73d0efb1202ce62f7aa287f141befdd8bcba21f7
2020-04-27Set min_sdk_version to be part of mainline modulesandroid-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_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_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-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_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_r12android11-mainline-tethering-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-devJooyung Han
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 Merged-In: Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e Change-Id: Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e (cherry picked from commit 153d61e685d083f35d2aff53cb03ed12aa977ac4)
2020-02-14[automerger skipped] Cherry-pick security fix for skip_input_data am: ↵Chong Zhang
956052dd8b am: d5973796ce -s ours am skip reason: skipped by user chz Change-Id: Ib192f88aa7ea7c2d2fc03a7f8ffeb9027507b260
2020-02-14Cherry-pick security fix for skip_input_data am: 956052dd8bChong Zhang
Change-Id: I302b3168c756b05c0ece74d42091378406464014
2020-02-05Cherry-pick security fix for skip_input_dataChong Zhang
Avoid complete roll of r1732 as there are fixes needed in other projects for that. Manually cherry-pick the security fix only. bug: 135532289 Change-Id: I8237fe185b45ba5054504114eef79a265768de4e Merged-In: Ibf05a0e54c7bc882788194862cdd94fccfba5ebf
2019-12-17Merge "Make libyuv available on the host." am: ac0a9a68b2 am: 608ebab202 am: ↵Automerger Merge Worker
89330bce50 Change-Id: I07e3c8236f52e5e0f4ae9c8b196c8b0b7257c0cd
2019-12-17Merge "Make libyuv available on the host." am: ac0a9a68b2 am: 608ebab202android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
Change-Id: Ief605eeadc4d40f9f06b5f5fe251dc5dab3e73df
2019-12-17Merge "Make libyuv available on the host."Andreas Huber
am: ac0a9a68b2 Change-Id: I64274f00b0e083cefc15cfe269f1fc6689aee4ed
2019-12-17Merge "Make libyuv available on the host."android-r-preview-1Treehugger Robot
2019-12-17Make libyuv available on the host.Andreas Huber
Bug: 141887532 Test: launch_cvd --start_webrtc --webrtc_public_ip=127.0.0.1 Change-Id: I19fdda51060da9f90d33eb94f226a8d34fb7c412
2019-12-16Merge "Add fuzz target for libyuv's mjpeg decoder" am: efc7acb528 am: ↵Automerger Merge Worker
086550483e am: 15481f4b07 Change-Id: I8c9e692ba1681fd3ce3951ff797a76ad14edb406
2019-12-16Merge "Add fuzz target for libyuv's mjpeg decoder" am: efc7acb528 am: 086550483eAutomerger Merge Worker
Change-Id: Ie9e0285dfbe507d6cf3599dedaface3a9947d825
2019-12-16Merge "Add fuzz target for libyuv's mjpeg decoder"Kyriakos Ispoglou
am: efc7acb528 Change-Id: I3da5d6a7e5c555f45b53238a61a84f08116be5b9
2019-12-16Merge "Add fuzz target for libyuv's mjpeg decoder"Kyriakos Ispoglou
2019-12-13Add fuzz target for libyuv's mjpeg decoderKyriakos Ispoglou
Test: Fuzz Target runs successfully on Taimen devices Change-Id: I7beeaeee6932f8920ad4f9a6bb50603259a85e75
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 4f4e977699 am: 349a55e8d8 -s ours am skip reason: subject contains skip directive Change-Id: Iaa4e32b1be60d54cc32f1a5ba2cba5f881cb58fd
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 4f4e977699 Change-Id: If2329c750ff0a08cb5a68610b92d83b562e83d76
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I133b5a11c3de241fd5be2f0cec155f7c758d9f2d
2019-10-15Add ABGRToNV12Hirokazu Honda
This CL adds ABGRToNV12 in libyuv library in ARC++P. The libyuv master branch already has the function. The CL is based on https://chromium-review.googlesource.com/c/libyuv/libyuv/+/1739509. Bug: 140458621 Test: android.video.cts.VideoEncoderDecoderTest#testAvcOther0Perf1280x0720 on cave Change-Id: I7bed7f2d17ee1cc1bf5b0302beebed2eca89df82 (cherry picked from commit ee8c98966cd696852bfb383c56029f85db890ffe)
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 9ed5ee986e -s ours am: 192858f513 -s ours am: 00b003de79 -s ours am skip reason: change_id I3671f9aedcd13d4e7874384ce1473627e6fe6d77 with SHA1 c850ed257a is in history Change-Id: Iafbce5fa45027b53342fc53122fb036e09838561
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 9ed5ee986e -s ours am: 192858f513 -s ours am skip reason: change_id I3671f9aedcd13d4e7874384ce1473627e6fe6d77 with SHA1 c850ed257a is in history Change-Id: I365c4bcf2031828d0349ad4b10c5e40fce92ffdc
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 9ed5ee986e -s ours am skip reason: change_id I3671f9aedcd13d4e7874384ce1473627e6fe6d77 with SHA1 c850ed257a is in history Change-Id: I65ec8c94a16b55bad38f378e5194feddc77cd85d
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I257ec019a01a4c90ceea77590709474276a58ff0 Merged-In: I3671f9aedcd13d4e7874384ce1473627e6fe6d77
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
431834fadf -s ours am: a935b7b153 am: c6e5c171f5 am: d07a060f8a -s ours am skip reason: subject contains skip directive Change-Id: I656061d059da7cab32175a358bf31428b9eb14f0
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
431834fadf -s ours am: a935b7b153 am: c6e5c171f5 Change-Id: I3862e89bf2f75f48a5098951a29a3732ee2bb7a3
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
431834fadf -s ours am: a935b7b153 Change-Id: I63b03b3be2eb747fd92cb7ed71b5e911924eb271
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 431834fadf -s ours am skip reason: subject contains skip directive Change-Id: Id95b12a236772991656c88da41fec1eb082512d5
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: I3671f9aedcd13d4e7874384ce1473627e6fe6d77
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 953aa50f56 am: e9a1af0c87 -s ours am skip reason: subject contains skip directive Change-Id: I3b03d66bb4b3f95a63996c7897775c3cf929b161
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 953aa50f56 Change-Id: Idaef3b60adefee9e4162612242df92f3ce2901e0
2019-07-01libyuv roll to r1732 to pick up security fixesChong Zhang
bug: 135532289 Change-Id: Ibf05a0e54c7bc882788194862cdd94fccfba5ebf
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I8f1653c7e8f3f6f74acc3eca1d490e4575ad9e61
2019-06-27libyuv roll to r1722 to pick up a few methodsChong Zhang
that we've been manually cherry-picking. bug: 132357297 test: MediaMetadataRetriever test; manual testing thumbnails in Photos. Exempt-From-Owner-Approval: files/infra/config/OWNERS owner names are not in android gerrit, CL fail to push with these. Delete of file need to bypass owner. Change-Id: Ic22346e45671452429716be8b0a1999eeaea0d7b
2019-05-14Merge "Add chz to OWNERS file" into qt-dev am: bfa54adbdfXin Li
am: 0a5d58014b Change-Id: I3e48ddb1324dade0d690c85de53a6452c97f88f4
2019-05-14Merge "Add chz to OWNERS file" into qt-devXin Li
am: bfa54adbdf Change-Id: Iaf7913f537c3238be06a5a9a75798c30f9debfc7
2019-05-14Merge "Add chz to OWNERS file" into qt-devandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-devandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
2019-05-14NV21ToABGR for Android camera conversions am: 11bb2a3be0Frank Barchard
am: baa23be2b6 Change-Id: I4c96d3e4da160f8a0de9f33dba8b310752b67fe5
2019-05-14NV21ToABGR for Android camera conversionsFrank Barchard
am: 11bb2a3be0 Change-Id: I411eee6f802196f21fa7fa2d2905af4356119bff
2019-05-13NV21ToABGR for Android camera conversionsFrank Barchard
Bug: libyuv:762 Test: NV21ToABGR unittest Change-Id: I71448ab83930339083f07eeafccf240c6cb41c48 Reviewed-on: https://chromium-review.googlesource.com/795212 Commit-Queue: Frank Barchard <fbarchard@chromium.org> Reviewed-by: Cheng Wang <wangcheng@google.com> (cherry-picked from https://chromium-review.googlesource.com/795212) bug: 129908793
2019-05-13Add chz to OWNERS fileThomas Joseph Avila
Bug: 132637962
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
am: d447e578c3 -s ours am skip reason: subject contains skip directive Change-Id: Ibd91e88e53afd8c45d2ee914d3589a8369801521
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: I149b96a58adf9d187cdf2ceddb3bcdc2d485c00a
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: a0fcb3087c -s ours am: 81533d4a1d -s ours am: 2f130109ad -s ours Change-Id: Id972a535e16df836e43214b1f180b25a66b8c278
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: a0fcb3087c -s ours am: 81533d4a1d -s ours Change-Id: I3ca458f7b531fe3fb98c5044395768b293138904
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: a0fcb3087c -s ours Change-Id: Ifbec80be45599adbff64c5be25241bf6999d60f8
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-n-iot-release-ihome-igv1oreo-mr1-iot-releasenougat-iot-releaseBill Yi
Change-Id: I74559e5cfdc3dc3d45ca1a1a8a434ebac95a7bd4
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 007fc2adb6 -s ours am: 0bb3133ddf -s ours Change-Id: I13b89f3b7e636b2be68b06fade4d48de9e4ee993
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 007fc2adb6 -s ours Change-Id: Ib809d4fce71c9ea0558a48766237e1422c093bec
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 04:40:00 +0000