aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-03Merge master@5428150 into git_qt-dev-plus-aosp.android-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_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-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_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseBill Rassieur
am: f998b55aad Change-Id: Ib3160f6e379f99fc476621990ed97aea69277e50
2019-04-02Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: I422285de38de7d3500774e25efc69b46cc4d3cca BUG: 129345239
2019-03-29Merge "Check for upper bounds of nselectors." am: d8e8ba4d7b am: 15d352377bAmin Hassani
am: 4dda28e9be Change-Id: I11f45698fb69481a8b58016abc564a5dcb2dc092
2019-03-29Merge "Check for upper bounds of nselectors." am: d8e8ba4d7bAmin Hassani
am: 15d352377b Change-Id: I4a334fd3c282262c21851d263d4df94e02b38142
2019-03-29Merge "Check for upper bounds of nselectors."android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Amin Hassani
am: d8e8ba4d7b Change-Id: Ie5b372f0617f3a9a7deba3ba36c86df295db3ff6
2019-03-29Merge "Check for upper bounds of nselectors."android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseTreehugger Robot
2019-03-29Check for upper bounds of nselectors.Amin Hassani
Currently there is no check for the upper bounds of the nselectors. Hence, a corrupt input can cause a segfault. This issue was discovered by one of our fuzzers. The actual error was: ../bzip2-1.0.6/decompress.c:299:10: runtime error: index 18002 out of bounds for type 'UChar [18002]' Test: mma Change-Id: Ie16067b2101bfdf6d54f6892a717e66f7420e926
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 76a72eaa29 Change-Id: I89e86dc0aae7ca5aae569266b983516eec0b15ce
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ifb35ca3580b4e6ee29777ed0f35ec8036b08069e
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I75de339e0b9abe994104d6052cbf19b2aed5b1e0
2019-02-20Merge "Make bzip2 available for the host too." am: 956e233d9a am: 07f95641bcElliott Hughes
am: 608b642bfd Change-Id: I30166c3eec494386a23c9e230f08df47ad5c9467
2019-02-20Merge "Make bzip2 available for the host too." am: 956e233d9aElliott Hughes
am: 07f95641bc Change-Id: I47f8a3f49a05af3ac79dbf7a7ee22ecf60604bf2
2019-02-20Merge "Make bzip2 available for the host too."Elliott Hughes
am: 956e233d9a Change-Id: I8fe6b6eba41e525856032039b8159f64aa66d9f6
2019-02-20Merge "Make bzip2 available for the host too."android-q-preview-1android-o-mr1-iot-release-1.0.10Elliott Hughes
2019-02-19Make bzip2 available for the host too.Elliott Hughes
(bzip2 is currently in the `Allowed` list in `ui/build/paths/config.go`.) Test: builds Change-Id: I80ac17661f76e91de86556e9c67287b150082106
2018-12-13Merge "Add OWNERS." am: d3f226c529 am: 1b8d0b4523Elliott Hughes
am: 386bcfc2fe Change-Id: I6076b0b5c4b7c2659a50761d77ea335bf6ec156e
2018-12-13Merge "Add OWNERS." am: d3f226c529Elliott Hughes
am: 1b8d0b4523 Change-Id: I2df5f317ae8d56b8c90dd57f7329944fb988adf2
2018-12-13Merge "Add OWNERS."Elliott Hughes
am: d3f226c529 Change-Id: I9b4c93e3d87f29224ebeac85dfa02a07f2e5b293
2018-12-13Merge "Add OWNERS."android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot
2018-12-12Add OWNERS.Elliott Hughes
Test: N/A Change-Id: I70ae6e1bca9b8aaeb53230bc995d4b426f1aba34
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: 915df95dd4 -s ours am: ↵Xin Li
57c12f1dc6 -s ours am: 216c4efe17 -s ours Change-Id: I0116cebc63e27d6a4b1d9e1f0a02aab2c7ad3af9
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: 915df95dd4 -s oursXin Li
am: 57c12f1dc6 -s ours Change-Id: If095e3f8616645a6079cf1789e33ef83363f964b
2018-12-10[automerger skipped] Merge "DO NOT MERGE"Xin Li
am: 915df95dd4 -s ours Change-Id: Ic12f5392b7729c59ab6b3c2da660d8b9e7bcc407
2018-12-10Merge "DO NOT MERGE"Treehugger Robot
2018-12-07DO NOT MERGEXin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: Ia779f90f116f8ecafafbbd218e09182a082a5e0f
2018-11-01Merge "Mark libbz as recovery_available for update_engine_sideload" am: ↵Dan Willemsen
bf89db82dc am: 3ddd099912 am: 1338bd7bdf Change-Id: I8fcce9b4b0f54ff349d6dcc972565584ba86d4f4
2018-11-01Merge "Mark libbz as recovery_available for update_engine_sideload" am: ↵Dan Willemsen
bf89db82dc am: 3ddd099912 Change-Id: I705d308717869cacd60e69478054ffef4871433a
2018-11-01Merge "Mark libbz as recovery_available for update_engine_sideload"Dan Willemsen
am: bf89db82dc Change-Id: I3eb3fc4b1ac2f35c0674be799d7097bf887b4f8d
2018-11-02Merge "Mark libbz as recovery_available for update_engine_sideload"android-wear-8.0.0_r2android-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-n-iot-release-ihome-igv1nougat-iot-releaseDan Willemsen
2018-10-23Mark libbz as recovery_available for update_engine_sideloadDan Willemsen
Test: build update_engine_sideload Change-Id: I5600439abeb911a5b62a4ff2ef3e6b05fc385797
2017-10-13Snap for 4393550 from a5304fb28b079b3980ff094cbeb604aa217d21e9 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: I4edd37d84e9d8ac9da83f45cf526817b108361e9
2017-10-11Merge "Build both of static and shared libs." am: ec365b3787 am: 94d2512ef4 ↵android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseTao Bao
am: 15597ad460 am: 757884d3a8 Change-Id: Ifd89583530d08a0f37095ffb836605ea0c0131f3
2017-10-11Merge "Build both of static and shared libs." am: ec365b3787 am: 94d2512ef4android-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Tao Bao
am: 15597ad460 Change-Id: I6564fe94fdf6912ac25474bd485868b58a0228d4
2017-10-11Merge "Build both of static and shared libs." am: ec365b3787Tao Bao
am: 94d2512ef4 Change-Id: I48e4c59d50959ee4ced72e0153f96b7280333385
2017-10-11Merge "Build both of static and shared libs."android-o-mr1-iot-preview-6o-mr1-iot-preview-6Tao Bao
am: ec365b3787 Change-Id: Ide18b0e5db46a254f3fb90def4a5211b605e94c2
2017-10-11Merge "Build both of static and shared libs."Tao Bao
2017-10-10Build both of static and shared libs.Tao Bao
Also move bzip2 to use the shared library. Test: mmma external/bzip2 Change-Id: I9e9495f79c0d2dc4a345ce840602e01cea1aa00f
2017-09-29release-request-fbd98711-169e-4972-a5f2-db043df00e09-for-git_pi-release-4367 ↵android-build-team Robot
572 snap-temp-L13500000107248413 Change-Id: If1c9f5087d3c1a039fa0781b711e65babad1a6fa
2017-09-27Merge "Use -Werror in external/bzip2" am: a0df5d74ad am: 0d71f00a5f am: ↵Chih-Hung Hsieh
5c2c573231 am: ecfb9a2781 Change-Id: I3488f2c3fc53d9ba338ec2ec0a76015264c1c4b8
2017-09-27Merge "Use -Werror in external/bzip2" am: a0df5d74ad am: 0d71f00a5fChih-Hung Hsieh
am: 5c2c573231 Change-Id: Ia0a8ff814fa4e4cfa4ee86d3ccf4587b8545d579
2017-09-27Merge "Use -Werror in external/bzip2" am: a0df5d74adChih-Hung Hsieh
am: 0d71f00a5f Change-Id: I92b694e2c46516c141c3c62c22a2e2e5a89fc749
2017-09-27Merge "Use -Werror in external/bzip2"Chih-Hung Hsieh
am: a0df5d74ad Change-Id: Id1f9afc19cef36a3b6265b1db0aa7e9508ab46ac
2017-09-27Merge "Use -Werror in external/bzip2"Treehugger Robot
2017-09-27Use -Werror in external/bzip2Chih-Hung Hsieh
Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: I0a2edf629260d179476903548c1a1c4a6a4df594
2017-03-30Build bzip2/bunzip2/bzcat. am: ba3e19c9a5android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21oreo-mr1-devoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devElliott Hughes
am: 1016148733 Change-Id: I41ba58959f63040fbea60b7da9d63228cc726c60
2017-03-30Build bzip2/bunzip2/bzcat.android-o-mr1-preview-2android-o-mr1-preview-1Elliott Hughes
am: ba3e19c9a5 Change-Id: I6704e7715e692db00096bab8b5c3544da447716a
2017-03-29Build bzip2/bunzip2/bzcat.android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-releaseElliott Hughes
Bug: http://b/36653808 Test: builds (cherry picked from commit 9fa5f2d123ef61213bb74d261a982a5da30147de) Change-Id: Ia218b519c92d2a38f22a4de28c30d1acad723aa6
2017-03-29Merge "Build bzip2/bunzip2/bzcat." am: fc47d4667b am: 0600e5668b am: 1751d0ef09Elliott Hughes
am: 14c349bda9 Change-Id: I5d67b959abef2971ca096cf52a833946b5bea783
2017-03-29Merge "Build bzip2/bunzip2/bzcat." am: fc47d4667b am: 0600e5668bElliott Hughes
am: 1751d0ef09 Change-Id: Iad7b2147274ba0e8512b29f69edc3e0560cd819d
2017-03-29Merge "Build bzip2/bunzip2/bzcat." am: fc47d4667bElliott Hughes
am: 0600e5668b Change-Id: I2b59de2951d8adccf422e2738335ad20e45aff4e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 15:08:15 +0000