aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c -s ours am: 4aff610208 -s ours am: bb6cdd2c0c -s ours am: a10791aebb -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 153d61e685 is in history Change-Id: I95ced294cc5a1f30b8f7f951498e7208b1823f5a
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c am: 3087a6b713 -s ours am: 1936f9688e -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 edabab205c is in history Change-Id: Ie918e198f14b36cc7d8a840f2642f9eb81338007
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c -s ours am: 4aff610208 -s ours am: bb6cdd2c0c -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 153d61e685 is in history Change-Id: I5ee3d73ffa9c7ccb3136161427456432588d564d
2020-04-27Set min_sdk_version to be part of mainline modules am: edabab205c am: ↵Jooyung Han
3087a6b713 am: 38bdba20e2 Change-Id: I0b9b441e48123a3fd9db742cd2ac0eb3d7993f78
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-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c am: 3087a6b713 -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 edabab205c is in history Change-Id: I471be76fe3cf6dc44442817702bd76f76d4bfa90
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c -s ours am: 4aff610208 -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 153d61e685 is in history Change-Id: I86d2f1580520b549ec8df8a14d9b4fd6bd9b0139
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 153d61e685 is in history Change-Id: Ibddaf37cd4780eb79fffd9bcd405dc25a1f22044
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-04-23Merge "Set min_sdk_version to be part of mainline modules" am: 1cad419d4d ↵Jooyung Han
am: 9354324ef0 am: b999e5d774 am: 8c6fde8b57 am: d1c410900c Change-Id: I0d73497f28fc26c79b295715deb54483db2ae2c5
2020-04-23Merge "Set min_sdk_version to be part of mainline modules" am: 1cad419d4d ↵Jooyung Han
am: 9354324ef0 am: b999e5d774 am: 8c6fde8b57 Change-Id: Ic6ffa3ab11412aa7194af0c41f806d7b162db471
2020-04-23Merge "Set min_sdk_version to be part of mainline modules" am: 1cad419d4d ↵Jooyung Han
am: 9354324ef0 am: b999e5d774 Change-Id: I0c9892b03c04a69dbd75488b1932541814e64efb
2020-04-23Merge "Set min_sdk_version to be part of mainline modules" am: 1cad419d4d ↵Jooyung Han
am: 9354324ef0 Change-Id: I7da3f3771726ac0b460b193b1606cca3a7e0ecc4
2020-04-23Merge "Set min_sdk_version to be part of mainline modules" am: 1cad419d4dJooyung Han
Change-Id: Id4fad73cf4ea66203711c19696289a06c5793012
2020-04-23Merge "Set min_sdk_version to be part of mainline modules"Jooyung Han
2020-04-23Set min_sdk_version to be part of mainline modulesJooyung 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 Change-Id: Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3e4aaec338 -s ours am: 5fe9da01ff am: d71f6e1f52 am: 370260bc0c -s ours am skip reason: subject contains skip directive Change-Id: I41868083f3d09b96f2244629dd8d896509ad38a2
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3e4aaec338 -s ours am: 5fe9da01ff am: d71f6e1f52 Change-Id: I55fe78a059ebc8c3a45f11ba5addd9e3d3478396
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3e4aaec338 -s ours am: 5fe9da01ff Change-Id: I950acc613a06a3cef2f24c0e695110a319cac7f0
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3e4aaec338 -s ours am skip reason: subject contains skip directive Change-Id: I643b432924cd21e4a653ca844a1a329e7d6df50e
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I6786c6a810c504f1ac50bb566ff96840c6591c18
2020-03-20[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stage-aosp-master am: c2c2a13316 -s ours am: df4dc934fd am: e09047ec79 am: 4d5a8760e3 -s ours am skip reason: subject contains skip directive Change-Id: Ie3f16b4d31d61b5b3a3dbd99feb67ce9ea1677aa
2020-03-20[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stage-aosp-master am: c2c2a13316 -s ours am: df4dc934fd am: e09047ec79 Change-Id: I5d31e8fa645341e14f036f6fffa836e864826f65
2020-03-20[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stage-aosp-master am: c2c2a13316 -s ours am: df4dc934fd Change-Id: Iacc56c0b90ef743e8dece2f007593c7a9016303b
2020-03-20DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master ↵Xin Li
am: c2c2a13316 Change-Id: I9dfc699d221c900c3a80dfc9d691e74cb9f834ea
2020-03-20[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stage-aosp-master am: c2c2a13316 -s ours am skip reason: subject contains skip directive Change-Id: I38f99bf99b4236a53a078a03b51d867bd188495b
2020-03-19DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-masterXin Li
Bug: 151763422 Change-Id: I8eadedc148f7f5a5a59c1ba831712ca49f2e5719
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 13:46:08 +0000