aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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: 3b55d19823 am: ef2142980b -s ours am skip reason: subject contains skip directive Change-Id: If1d2ab0e4a41c000714eede07c23063f1d2fa611
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: 3b55d19823 Change-Id: Ibd7c3e43e535ab991fceac961ae669ab497c3c0a
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: Iaef7e9813279d7154295e720506abbd08e2be0ba
2019-10-18Merge "Restrict visibility of libraries that are newly vendor_available: ↵Bill Peckham
true." am: 82d49b0efa am: 81e4be9317 am: 25867702bf am: c176e2365e Change-Id: Ie575f7d1439ec106f94ae0f7e7973c811759172e
2019-10-18Merge "Restrict visibility of libraries that are newly vendor_available: ↵Bill Peckham
true." am: 82d49b0efa am: 81e4be9317 am: 25867702bf Change-Id: I82e1b1325be633bdd0de6cbe2d204b3ddd88dfba
2019-10-18Merge "Restrict visibility of libraries that are newly vendor_available: ↵Bill Peckham
true." am: 82d49b0efa am: 81e4be9317 Change-Id: If472025ff191131ff5996ee97417485e94a70c8e
2019-10-18Merge "Restrict visibility of libraries that are newly vendor_available: true."Bill Peckham
am: 82d49b0efa Change-Id: I9b8577eadf0b86fe6ae09c544602678843ecf643
2019-10-18Merge "Restrict visibility of libraries that are newly vendor_available: true."Bill Peckham
2019-10-17Restrict visibility of libraries that are newly vendor_available: true.Bill Peckham
As part of fixing b/68319577, some libraries were made vendor_available: true. To minimize new dependencies from vendor on these libraries, this change restricts the visibility of the libraries to only the framework projects that currently use them. This change does two things. It makes libbz a static libarary only (drops the shared library). It restricts the visibility of the static library to only the framework projects that currently use it. Bug: 141649008 Test: Targets build successfully. Change-Id: Icb2974bd890a705f827f98a2526eed21625bf9f4
2019-10-09Merge "Update OWNERS." am: f41aefd551 am: d62a7013ab am: 78bda636caTao Bao
am: c71f3f9799 Change-Id: I8aa0eac0a1b7fec3d6cf23e5feb91d38aa7c9d03
2019-10-09Merge "Update OWNERS." am: f41aefd551 am: d62a7013abTao Bao
am: 78bda636ca Change-Id: I6e2df6a99054ce4e45783ae25ad41b8248b8e9a3
2019-10-09Merge "Update OWNERS." am: f41aefd551Tao Bao
am: d62a7013ab Change-Id: I03227a01564950cfecaa508c27bab01c652773c7
2019-10-09Merge "Update OWNERS."Tao Bao
am: f41aefd551 Change-Id: I1ce530b90fe80911fbe0b56e1ee7d3abd930ffaa
2019-10-09Merge "Update OWNERS."ndk-sysroot-r21Tao Bao
2019-10-08Update OWNERS.Tao Bao
Test: N/A Change-Id: I33a8875ec0d3164299b23bfa21ded910b27cfbe2
2019-10-04Merge "Moving recovery resources from /system to /vendor" am: 2d7de3d682 am: ↵Bill Peckham
519e85b5f3 am: d4eaa4a174 am: bff3aed7c5 Change-Id: I21e5c969a206f4bb60e42cae535b34e3e5cdec1b
2019-10-04Merge "Moving recovery resources from /system to /vendor" am: 2d7de3d682 am: ↵Bill Peckham
519e85b5f3 am: d4eaa4a174 Change-Id: Ic57684498068179d15291768b725ca66b1efa614
2019-10-04Merge "Moving recovery resources from /system to /vendor" am: 2d7de3d682Bill Peckham
am: 519e85b5f3 Change-Id: I7a56d39f39a227fc748b182be4934b8082a60c31
2019-10-04Merge "Moving recovery resources from /system to /vendor"Bill Peckham
am: 2d7de3d682 Change-Id: Ibd8a725435109284b83f3ba3dd22e16f2f949c4d
2019-10-05Merge "Moving recovery resources from /system to /vendor"Bill Peckham
2019-09-24Moving recovery resources from /system to /vendorBill Peckham
This change is part of a topic that moves the recovery resources from the system partition to the vendor partition, if it exists, or the vendor directory on the system partition otherwise. The recovery resources are moving from the system image to the vendor partition so that a single system image may be used with either an A/B or a non-A/B vendor image. The topic removes a delta in the system image that prevented such reuse in the past. The recovery resources that are moving are involved with updating the recovery partition after an update. In a non-A/B configuration, the system boots from the recovery partition, updates the other partitions (system, vendor, etc.) Then, the next time the system boots normally, a script updates the recovery partition (if necessary). This script, the executables it invokes, and the data files that it uses were previously on the system partition. The resources that are moving include the following. * install-recovery.sh * applypatch * recovery-resource.dat (if present) * recovery-from-boot.p (if present) This change supports making a direct or transitive dependency of the applypatch executable available to applypatch, which is now on vendor. Bug: 68319577 Test: Ensure that recovery partition is updated correctly. Change-Id: I2784b2d2a10074ff62cc7672c98f36eba34c79c3
2019-09-23Merge "Use static libbz for bzip2." am: 082d74d223 am: 4d03da66e3 am: 1520fd3eafElliott Hughes
am: c881a5a12c Change-Id: I1ac84dc496c1a2f8890cc7c77d90d5c605b3a64c
2019-09-23Merge "Use static libbz for bzip2." am: 082d74d223 am: 4d03da66e3Elliott Hughes
am: 1520fd3eaf Change-Id: I104acb9cd0dea1afe00b9e57688f924cd65c85a9
2019-09-23Merge "Use static libbz for bzip2." am: 082d74d223Elliott Hughes
am: 4d03da66e3 Change-Id: Ib0ce63782e7fc6e16abfd5cd06c8d5725a9cf9b0
2019-09-23Merge "Use static libbz for bzip2."Elliott Hughes
am: 082d74d223 Change-Id: I16529520ffd254924b66bb7da3e4e11f316d0584
2019-09-23Merge "Use static libbz for bzip2."Treehugger Robot
2019-09-23Use static libbz for bzip2.Elliott Hughes
Everyone else is using a static copy (because everyone else is part of the OTA system), so using a shared library just wastes space... Before: 79776 /system/lib64/libbz.so 36264 /bin/bzip2 116040 After: 97200 /bin/bzip2 Test: adb shell ls -l Change-Id: I90263a10d1fc989e049702a90d29851f47eb81fb
2019-04-03Merge master@5428150 into git_qt-dev. am: e85c94e4abBill Rassieur
am: af22422813 Change-Id: If96d4cccfebed8b1d309d13d363984a16c3af28c
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-03Merge master@5428150 into git_qt-dev.Bill Rassieur
am: e85c94e4ab Change-Id: I0bd94adbecefd21747ad6d0d081ccf34bd4e0ea8
2019-04-02Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: I422285de38de7d3500774e25efc69b46cc4d3cca BUG: 129345239
2019-04-02Merge master@5428150 into git_qt-dev.Bill Rassieur
Change-Id: Icf415dcb913b8ba959f6056dc190951b06a4923b 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 20:45:02 +0000