aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-19Merge "Allow libsnapshot to link to libbz." am: 2ef0545ad7David Anderson
Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619 Change-Id: I22c5e83161689f83a299516148fe193e881b40e9
2020-08-19Merge "Allow libsnapshot to link to libbz."David Anderson
2020-08-06Allow libsnapshot to link to libbz.David Anderson
Bug: 1378463 Test: m vab_convert_payload Change-Id: Ic58157fc78ecbc212fb3789651eb3954cfe5158e
2020-04-29Merge "Add METADATA to bzip2: Apache2+BSD=NOTICE" am: eb041812a7 am: ↵Treehugger Robot
a75d53c4ba am: c2e02fb6bf am: 5e4f974ea5 am: e2d2915caa Change-Id: I8bbe65d7b4d3b8107bf24f6662efbd5a98267cce
2020-04-29Merge "Add METADATA to bzip2: Apache2+BSD=NOTICE" am: eb041812a7 am: ↵Treehugger Robot
a75d53c4ba am: c2e02fb6bf am: 5e4f974ea5 Change-Id: I672be222e60d7222691aae97d569ab804c4b1f67
2020-04-29Merge "Add METADATA to bzip2: Apache2+BSD=NOTICE" am: eb041812a7 am: ↵Treehugger Robot
a75d53c4ba am: c2e02fb6bf Change-Id: Id641096642561af9915b18b899b9123afeb13669
2020-04-29Merge "Add METADATA to bzip2: Apache2+BSD=NOTICE" am: eb041812a7 am: a75d53c4baTreehugger Robot
Change-Id: I207b48f559ebeef67028e7273ee46aa07accaf75
2020-04-29Merge "Add METADATA to bzip2: Apache2+BSD=NOTICE" am: eb041812a7android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I1a69e5717a7ae29d2d30a66ce28eb9822a6e9a5c
2020-04-29Merge "Add METADATA to bzip2: Apache2+BSD=NOTICE"Treehugger Robot
2020-04-28Add METADATA to bzip2: Apache2+BSD=NOTICEBob Badour
GPL fonts in manual have addendum allowing inclusion in documents. Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I3cb5aeed9446318825ff939c63df57d1ad675394
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: bfbb28f836 -s ours am: 9cda868da9 am: 5ff4807347 am: f957b634f6 -s ours am skip reason: subject contains skip directive Change-Id: I0cf3758fffe0ec6505117e331929f97dfe5d996a
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: bfbb28f836 -s ours am: 9cda868da9 am: 5ff4807347 Change-Id: I7f06441bed6d9250df58a7840b8b55a4f6f970b7
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: bfbb28f836 -s ours am: 9cda868da9 Change-Id: Ieb14bd28064d8d0033711f0ede81752ba6f9ddea
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: bfbb28f836 -s ours am skip reason: subject contains skip directive Change-Id: Ib2e911728f2b793e890ee47b902d46f1914d2166
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I1eacd3e9b39d310a443221eed127ffa65db93d86
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4b94ddbfd0 am: ↵Treehugger Robot
216f77451a am: 7667d2d91a am: 8f404e53d9 am: 431e73294f Change-Id: Ia2a8733cd2a86216d068a96a3ca2b77cc965f86a
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4b94ddbfd0 am: ↵Treehugger Robot
216f77451a am: 7667d2d91a am: 8f404e53d9 Change-Id: I583e3151744cdfde30bd94719fc6bd79c8ef14f0
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4b94ddbfd0 am: ↵Treehugger Robot
216f77451a am: 7667d2d91a Change-Id: I8fd0b1bf347e374223380bdababaca23af9aa18b
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4b94ddbfd0 am: ↵Treehugger Robot
216f77451a Change-Id: Ic9e4be88d94bd7a907a6766e49a6dd684562c41f
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4b94ddbfd0 am: ↵Treehugger Robot
216f77451a Change-Id: Ic26781983387c1ddee683cb88ff0f1134d6c658a
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4b94ddbfd0Treehugger Robot
Change-Id: Idef5ea83a443d7cf0c4c25b0715a1fe5924a4787
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE."Treehugger Robot
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: I44bf9582d5ea6b9fbc4530b3df1ab67f2516a470
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 19:59:14 +0000