aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-24Mark ab/6881855 as merged am: cf58e0bb7c am: 704758a832Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/13112550 Change-Id: Ia99e248457ce4bdc3ed1234eda59d4d37426b0ac
2020-11-24Mark ab/6881855 as merged am: cf58e0bb7cXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/13112550 Change-Id: Ib2a17893bb358bfce818f90632cf8e7e7e558f37
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Iabd4ec5347b8bad4f38c9ccd40997e1009e455f5
2020-11-11Add "product_available" to product available modulesJustin Yun
"vendor_available" modules were available to product modules. However, not all "vendor_available" modules are required to be available to product modules. Some modules want to be available only to product modules but not vendor modules. To cover the requirement, we separate "product_available" from "vendor_available". "vendor_available" will not provide product available module. Bug: 150902910 Test: build Change-Id: I9f86b46416fffefa2749648c136bfc05b3488920
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 8d1a045313 -s ours am: ↵Xin Li
b709b831eb -s ours am: c554872be5 -s ours am skip reason: Change-Id I93747e6a05c361bb62a07229a5328a33b1be8114 with SHA-1 3e0481a510 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12796229 Change-Id: I5bf57a81b4191d66567e1667318d2002b4f707d7
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 8d1a045313 -s ours am: ↵Xin Li
b709b831eb -s ours am skip reason: Change-Id I93747e6a05c361bb62a07229a5328a33b1be8114 with SHA-1 3e0481a510 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12796229 Change-Id: I53a5c7964cad950fc08bf12ef8f091e33f012134
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 8d1a045313 -s oursXin Li
am skip reason: Change-Id I93747e6a05c361bb62a07229a5328a33b1be8114 with SHA-1 3e0481a510 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12796229 Change-Id: Iab84779f649aff7c3d40b4c2c552c4ab6737d24f
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I93747e6a05c361bb62a07229a5328a33b1be8114 Change-Id: I05dc93b185a578448ed567e1f465b2589ffed4f8
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: e1df04d400 -s ours am: b87faa2e64 -s ours am: 957d50d329 -s ours am: 48963c4cf3 -s ours am skip reason: Change-Id I7a1807955dcffb30deedcd3c864351aafdd74468 with SHA-1 d74e89f967 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12469773 Change-Id: Iad8d68fe8cab8940360609efc270336564b4afae
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: e1df04d400 -s ours am: b87faa2e64 -s ours am: 957d50d329 -s ours am skip reason: Change-Id I7a1807955dcffb30deedcd3c864351aafdd74468 with SHA-1 d74e89f967 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12469773 Change-Id: I2bf3e7c90f6cc92eb000ada6136dd9a4810b86bc
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: e1df04d400 -s ours am: b87faa2e64 -s ours am skip reason: Change-Id I7a1807955dcffb30deedcd3c864351aafdd74468 with SHA-1 d74e89f967 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12469773 Change-Id: Ib142a3b68747830e295719c4c307e3eb2a0faf0f
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: e1df04d400 -s ours am skip reason: Change-Id I7a1807955dcffb30deedcd3c864351aafdd74468 with SHA-1 d74e89f967 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12469773 Change-Id: I386380fc285d2bc00a052c2230e79156b9db7c15
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I7a1807955dcffb30deedcd3c864351aafdd74468 Change-Id: I0471736546250156829a0e4b38d36cc3803d362c
2020-07-28Merge "Rename CFI blocklist file." am: e6b2b9154e am: b42924c359 am: ↵Treehugger Robot
151f40c86e am: 3e0481a510 am: 4c9058b8cc Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1373396 Change-Id: Ie39adad5fa184e92817f930c263fde631841bf3d
2020-07-28Merge "Rename CFI blocklist file." am: e6b2b9154e am: b42924c359 am: ↵Treehugger Robot
151f40c86e am: 3e0481a510 Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1373396 Change-Id: Ib7acd72ddb459253883805fd40bcc956dd436fc4
2020-07-28Merge "Rename CFI blocklist file." am: e6b2b9154e am: b42924c359 am: 151f40c86eTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1373396 Change-Id: I93747e6a05c361bb62a07229a5328a33b1be8114
2020-07-28Merge "Rename CFI blocklist file." am: e6b2b9154e am: b42924c359Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1373396 Change-Id: Ic482adf7a2e96a311cdc28a3bb920b9e3ff41ec6
2020-07-28Merge "Rename CFI blocklist file." am: e6b2b9154eTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1373396 Change-Id: I9f1369c55b89117adacc70947e0530cfc54848d4
2020-07-28Merge "Rename CFI blocklist file."Treehugger Robot
2020-07-27Rename CFI blocklist file.Pirama Arumuga Nainar
Update language to comply with Android’s inclusive language guidance See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: build Change-Id: I2b82e7d5390e5385e700961587cf9288b89d0040
2020-04-29Merge "Add METADATA to compiler-rt: LLVM+MIT+BSD+Apache2=NOTICE" am: ↵Bob Badour
3103cf4307 am: 83c5095a0c am: d74e89f967 am: d4f9d93ebd am: c084f4435e Change-Id: Ib8812062db74c06c620b6a70089ec39bac004c86
2020-04-29Merge "Add METADATA to compiler-rt: LLVM+MIT+BSD+Apache2=NOTICE" am: ↵Bob Badour
3103cf4307 am: 83c5095a0c am: d74e89f967 am: d4f9d93ebd Change-Id: I17bd38cfb1d902a4751327346de8687e8e1c32f0
2020-04-29Merge "Add METADATA to compiler-rt: LLVM+MIT+BSD+Apache2=NOTICE" am: ↵Bob Badour
3103cf4307 am: 83c5095a0c am: d74e89f967 Change-Id: I801ad7e0a82294bab4ef259b5617b4c2c497911b
2020-04-29Merge "Add METADATA to compiler-rt: LLVM+MIT+BSD+Apache2=NOTICE" am: ↵Bob Badour
3103cf4307 am: 83c5095a0c Change-Id: I7a1807955dcffb30deedcd3c864351aafdd74468
2020-04-28Merge "Add METADATA to compiler-rt: LLVM+MIT+BSD+Apache2=NOTICE" am: 3103cf4307android-r-beta-3android-r-beta-2Bob Badour
Change-Id: I5cc4edbc4c5960605421716c5102bfbc43894484
2020-04-28Merge "Add METADATA to compiler-rt: LLVM+MIT+BSD+Apache2=NOTICE"Bob Badour
2020-04-28Add METADATA to compiler-rt: LLVM+MIT+BSD+Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I93ce811f87fa566dca1e0e05b0a1031a3df64c90
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6defbe27c0 -s ours am: 9abeca4cbc am: 58ea4dbe4e am: b5e90434c7 -s ours am skip reason: subject contains skip directive Change-Id: I8e3e2832b85cc16c68a6bb4f4a56931bcbffbdc6
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6defbe27c0 -s ours am: 9abeca4cbc am: 58ea4dbe4e Change-Id: Id69bd247fd613ebf4a1167481e43f78ff4ce26bd
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6defbe27c0 -s ours am: 9abeca4cbc Change-Id: I9cb622729bebe77d2a01e24eaa5889b1ef3d8d76
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6defbe27c0 -s ours am skip reason: subject contains skip directive Change-Id: I98bb91e4b474737d35faa73c5672472701f2b1ef
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I5e6174655d61837f76887e796274e1b0cd423ff8
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: b531a6bc14 -s ours am: 366e2e3334 am: 5c83ac80a9 am: ddc06a30bb -s ours am skip reason: subject contains skip directive Change-Id: Iaaa70567a2b387b0f7d7c3ad1baa8b1fb29e443e
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: b531a6bc14 -s ours am: 366e2e3334 am: 5c83ac80a9 Change-Id: I403b5ccf145c3cda0fb1a96d4f783d7ec0e09c1e
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: b531a6bc14 -s ours am: 366e2e3334 Change-Id: I17397e408d2fde071416e86dcd4bbc36b61749db
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: b531a6bc14 Change-Id: I4fddefb4802987dfbd631330f3c244c4b7dfbb76
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: b531a6bc14 -s ours am skip reason: subject contains skip directive Change-Id: Ie86e899d31e97b7aa25a0144e6e3c1b238453731
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I291757fdc99f4773beaca75e1a3a64d1c84a86e3
2020-03-07Merge "Remove mips workarounds." am: 54b43ff2d8 am: 77ed6cd76c am: ↵Automerger Merge Worker
e66e4d4216 am: 94cd854f1b am: 0e00e63d61 Change-Id: I3907ef0d1a8c70a154e1dfa3f781cf936e80e8f1
2020-03-07Merge "Remove mips workarounds." am: 54b43ff2d8 am: 77ed6cd76c am: ↵Automerger Merge Worker
e66e4d4216 am: 94cd854f1b Change-Id: I61c81003e96f7e5f774ef739abc6550608645232
2020-03-07Merge "Remove mips workarounds." am: 54b43ff2d8 am: 77ed6cd76c am: e66e4d4216Automerger Merge Worker
Change-Id: Ic276e526e47ad16a3b0ec4a4c82c24325b1c428f
2020-03-07Merge "Remove mips workarounds." am: 54b43ff2d8 am: 77ed6cd76cAutomerger Merge Worker
Change-Id: Ia5a2fbadb0671b30376c460b8940fa6e79d0ca52
2020-03-07Merge "Remove mips workarounds." am: 54b43ff2d8 am: 77ed6cd76cAutomerger Merge Worker
Change-Id: Iee4f1c012d3800b6665208ec49a3c40d9982b5e6
2020-03-07Merge "Remove mips workarounds." am: 54b43ff2d8Automerger Merge Worker
Change-Id: I04537c582b2e8198fea93b43dc38b65a30e67af5
2020-03-07Merge "Remove mips workarounds."android-r-preview-4android-r-preview-3android-r-preview-2Treehugger Robot
2020-03-06Remove mips workarounds.Elliott Hughes
Test: treehugger Change-Id: I51b52b6b5ee28ab213a392cc431ae99f9312925d
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: c72b929327 am: f47b4a41cd -s ours am skip reason: subject contains skip directive Change-Id: Ia1f58a037ce914cb4373ef9a39c578555b99c1f4
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: c72b929327 Change-Id: I2ed66755997b4b7d943d9206264db158ee43c460
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: I7db63264e0838893869783c8149d1f0e3e411c12
2019-09-18Merge "Ignore invalid utf-8 characters in symbolize.py" am: 5ba3ca7ad7 am: ↵Xuan Xing
36f0dec43f am: afa4a7aa4e am: 4ac7b0ec75 Change-Id: I97dd0ce306cba3595e3aa6ea77fa3d7d596f39c6
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 23:32:39 +0000