summaryrefslogtreecommitdiff
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: 5dd29168be am: 6037a9bba2 -s ours am skip reason: subject contains skip directive Change-Id: I3b642a1493f0102f72802ff146bcfad2d402d58a
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: 5dd29168be Change-Id: I17869a340ab5880f7876958b1b291d9425baf40c
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: I6dc0fbb45d506f97392b4a10097c922d47a2f4a5
2019-10-18Merge "Restrict visibility of libraries that are newly vendor_available: ↵Bill Peckham
true." am: 03c18c1012 am: dd59520774 am: 6e216eb8e5 am: c7c17a8d6f Change-Id: I8a9cc76e3801f9310219bb3a8c1292e6247a764d
2019-10-18Merge "Restrict visibility of libraries that are newly vendor_available: ↵Bill Peckham
true." am: 03c18c1012 am: dd59520774 am: 6e216eb8e5 Change-Id: Id0842ab9b3b3fff3f11324f808edae0177dc02d4
2019-10-18Merge "Restrict visibility of libraries that are newly vendor_available: ↵Bill Peckham
true." am: 03c18c1012 am: dd59520774 Change-Id: I8d6c52a1b4ec47418f32e565a29f9e71aaf9466e
2019-10-18Merge "Restrict visibility of libraries that are newly vendor_available: true."Bill Peckham
am: 03c18c1012 Change-Id: Iba590ed81a5e6112339ac6acb09c877eb577f019
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. Bug: 141649008 Test: Targets build successfully. Change-Id: I675f5d74bb6d1bf06ae5ebd8ae5bfdd5653485a3
2019-10-08Merge "Update OWNERS." am: 709ceec5bf am: 6b247e03f8 am: ff7c2c96b6Tao Bao
am: b4f9357a7c Change-Id: I15fb8a580ff1c90d5d98eeb4c0616c19ea248d47
2019-10-08Merge "Update OWNERS." am: 709ceec5bf am: 6b247e03f8Tao Bao
am: ff7c2c96b6 Change-Id: Ief4b440242b2565a3ba8ccc902bb1a99a4780e40
2019-10-08Merge "Update OWNERS." am: 709ceec5bfTao Bao
am: 6b247e03f8 Change-Id: I8e69d5c0feadbc4568d9ccdbf35a1b96869a399c
2019-10-08Merge "Update OWNERS."Tao Bao
am: 709ceec5bf Change-Id: Ie0340ee22e32e661ed496bdc9080ad00391dd034
2019-10-09Merge "Update OWNERS."ndk-sysroot-r21Tao Bao
2019-10-08Update OWNERS.Tao Bao
Test: N/A Change-Id: Ia76ae692c46add32eaa812b47e543c031c1a551d
2019-10-04Merge "Moving recovery resources from /system to /vendor" am: 179a84b941 am: ↵Bill Peckham
26ed6c7d42 am: 61af327e92 am: 33bbc3dcd6 Change-Id: I272c316902d55ce2f8b9996ee545993cdd3b7b94
2019-10-04Merge "Moving recovery resources from /system to /vendor" am: 179a84b941 am: ↵Bill Peckham
26ed6c7d42 am: 61af327e92 Change-Id: Ia979fe2f128ab40743c66f3ae81aee9c04f38757
2019-10-04Merge "Moving recovery resources from /system to /vendor" am: 179a84b941Bill Peckham
am: 26ed6c7d42 Change-Id: Ibcf6b1d5af5ecb3f6d5f4a890febaa9e3fe7aa8b
2019-10-04Merge "Moving recovery resources from /system to /vendor"Bill Peckham
am: 179a84b941 Change-Id: I5d709794527346b63e473da3cd3b17d31acb6bac
2019-10-05Merge "Moving recovery resources from /system to /vendor"Bill Peckham
2019-09-19Moving 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: I66059c3cfe2f65eca990b29609fd2c5f52e17266
2019-09-13Merge "Fix the unintialized value reported by msan" am: 3153f95a45 am: ↵Tianjie Xu
6dd761313e am: 20647fd05d am: 7ef65f8696 Change-Id: If72f52cbd3838e42230de0f673a163b6128d38a5
2019-09-13Merge "Fix the unintialized value reported by msan" am: 3153f95a45 am: ↵Tianjie Xu
6dd761313e am: 20647fd05d Change-Id: I2a33ad0931c5beb4460cb19c8feb22c765cba407
2019-09-13Merge "Fix the unintialized value reported by msan" am: 3153f95a45Tianjie Xu
am: 6dd761313e Change-Id: I5abf7371c65712410862b2fe3adf977b567fbb4d
2019-09-13Merge "Fix the unintialized value reported by msan"Tianjie Xu
am: 3153f95a45 Change-Id: I508cc97fa41029d1485c89792ea560a23749979d
2019-09-13Merge "Fix the unintialized value reported by msan"Tianjie Xu
2019-09-12Fix the unintialized value reported by msanTianjie Xu
Intialize option_index in case it's not set by getopt_long. Bug: 140493925 Test: blaze test pass Change-Id: I0f93ef9e3061df2ef7813630d58972e1e0ea8286
2019-06-18Merge "bspatch_fuzzer: guard againts integer overflow with bad patch" am: ↵Amin Hassani
10118144d0 am: ea33dbd616 am: 797bbc3120 am: f4c57d47ff Change-Id: I53ce727b58533f5b52745f073e0ca30e34600910
2019-06-18Merge "bspatch_fuzzer: guard againts integer overflow with bad patch" am: ↵Amin Hassani
10118144d0 am: ea33dbd616 am: 797bbc3120 Change-Id: Ia90db55aad75c9537c3181b69788a36627a72f94
2019-06-18Merge "bspatch_fuzzer: guard againts integer overflow with bad patch" am: ↵Amin Hassani
10118144d0 am: ea33dbd616 Change-Id: I286687f2302f029af98486a1f83a168a4c13f246
2019-06-18Merge "bspatch_fuzzer: guard againts integer overflow with bad patch"Amin Hassani
am: 10118144d0 Change-Id: I9d4f5f5e5de007efe56a4fea927989dcc6bea490
2019-06-18Merge "bspatch_fuzzer: guard againts integer overflow with bad patch"android-o-mr1-iot-release-1.0.14Treehugger Robot
2019-06-14bspatch_fuzzer: guard againts integer overflow with bad patchAmin Hassani
oldpos is a signed integer and an invalid input can cause integer overflow. This CL makes sure the interger overflow doesn't happen. The error message was: ../../../../../../../tmp/portage/dev-util/bsdiff-9999/work/bsdiff-9999/platform2/bsdiff/bspatch.cc:366:12: runtime error: signed integer overflow: 251 + 9223372036854775807 cannot be represented in type 'long' Bug: crbug.com/950591 Test: cros_fuzz --board=amd64-generic reproduce --fuzzer bspatch_fuzzer --testcase ~/trunk/clusterfuzz-testcase-bspatch_fuzzer-5689939906920448 --package bsdiff --build-type ubsan Change-Id: If1253483bc073cfb08867b531121d835078544bb
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-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-releaseXin Li
am: 1a313bad72 -s ours am skip reason: subject contains skip directive Change-Id: Ief0413c26b6ad365f7c74ab2fcdfde443e8ec1b0
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: I004dfd973f0d88ed308eb50955be071ba94442e1
2019-01-11Merge "Don't build `bspatch` executable for Android target." am: e36af14afc ↵Tao Bao
am: 6c325a227e am: ed145a0eee Change-Id: I5a4515b8d8ab521a81cf6155daa6a8acd182fc39
2019-01-11Merge "Don't build `bspatch` executable for Android target." am: e36af14afcTao Bao
am: 6c325a227e Change-Id: I114a128a7a17bd4b429803d7160dec645fd8055a
2019-01-11Merge "Don't build `bspatch` executable for Android target."Tao Bao
am: e36af14afc Change-Id: I3cec0d7a42797d583af7572e556a9d99cf6e5acd
2019-01-11Merge "Don't build `bspatch` executable for Android target."android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseTreehugger Robot
2019-01-10Don't build `bspatch` executable for Android target.Tao Bao
All the users should use libbspatch instead. The host rule stays for easier testing. Test: m checkbuild Change-Id: I4a23a7383ebda8b7bf61508ffe3cf47cc573ad29
2019-01-02Merge "Fix the BUILD.gn to conform with recent changes in platform2" am: ↵Amin Hassani
6bf987b165 am: b64bb6a292 am: 3803bf753a Change-Id: Ie9ead86713e8a2875172bbf1af0890c737074281
2019-01-02Merge "Fix the BUILD.gn to conform with recent changes in platform2" am: ↵Amin Hassani
6bf987b165 am: b64bb6a292 Change-Id: I8a25d2c3fef3f000348d78cc36b6426137f36f44
2019-01-02Merge "Fix the BUILD.gn to conform with recent changes in platform2"Amin Hassani
am: 6bf987b165 Change-Id: I28d64f1d00f8fdde964e83b95cfceeb96062dbb6
2019-01-02Merge "Fix the BUILD.gn to conform with recent changes in platform2"android-o-mr1-iot-release-1.0.8Treehugger Robot
2019-01-02Fix the BUILD.gn to conform with recent changes in platform2Amin Hassani
This includes: - Properly handling empty pkg_deps - Removing -l from the name of the libraries - Removing unneeded dependency to libchrome in unittest Bug: crbug.com/916765 Test: unittests Change-Id: I12989bac5a8495bc052ed4bdb762f33ae0ef5916
2018-11-27Merge "Return false for no compression." am: df9b6528ca am: f2b9f9bd7aSen Jiang
am: dd6df87228 Change-Id: Ia0c183392469468076db0a666d674e02ed0ded55
2018-11-27Merge "Return false for no compression." am: df9b6528caSen Jiang
am: f2b9f9bd7a Change-Id: Ieb1b65cc23feafeb40cf436c74eca372944fce10
2018-11-27Merge "Return false for no compression."Sen Jiang
am: df9b6528ca Change-Id: Ib584528aecc8b7b9ccbaeb1884ae64d9b405932e
2018-11-27Merge "Return false for no compression."android-wear-8.0.0_r2android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseTreehugger Robot
2018-11-26Return false for no compression.Sen Jiang
Test: None Change-Id: I21991c6ae9e55eac30d411e827d579e762c1fe86
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 06:02:28 +0000