aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2019-09-18Merge "Ignore invalid utf-8 characters in symbolize.py" am: 5ba3ca7ad7 am: ↵Xuan Xing
36f0dec43f am: afa4a7aa4e Change-Id: Id137190e371c9f7df2c1bc4e0984602f43811f59
2019-09-18Merge "Ignore invalid utf-8 characters in symbolize.py" am: 5ba3ca7ad7Xuan Xing
am: 36f0dec43f Change-Id: I5274c29ca1343565870fe358d37991bad87a7c2d
2019-09-18Merge "Ignore invalid utf-8 characters in symbolize.py"Xuan Xing
am: 5ba3ca7ad7 Change-Id: I66d751b83d498bb7fced6740e6657db839629ad3
2019-09-18Merge "Ignore invalid utf-8 characters in symbolize.py"ndk-sysroot-r21Xuan Xing
2019-09-17Ignore invalid utf-8 characters in symbolize.pyXuan Xing
Currently symbolize.py will crash when handling invalid UTF-8 characters. This happens when an Android application outputs extended characters such as "\xC0". Here is a simple test case of this issue: printf "TESTTEST\xC0TESTTEST"|symbolize.py Since in most cases we don't control application's output, it's better making the code resilient to those characters. Test: Ran the above test case and verified no more crashes. Change-Id: I82929ea11223b97e67862188b23157825ce38549
2019-08-14[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor ↵Xin Li
(5713463) in stage-aosp-master am: b0c3d33c82 -s ours am: 59ebd79fa4 am: 3681597cfe am: e2aa231a0b -s ours am skip reason: subject contains skip directive Change-Id: I77fc2df2f40ba54aaad3081549e112bcbac5a85e
2019-08-14[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor ↵Xin Li
(5713463) in stage-aosp-master am: b0c3d33c82 -s ours am: 59ebd79fa4 am: 3681597cfe Change-Id: I05d48273c060e5f5015203bce8bcb22d2b6f443a
2019-08-14[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor ↵Xin Li
(5713463) in stage-aosp-master am: b0c3d33c82 -s ours am: 59ebd79fa4 Change-Id: I811d536c2708b8b2e540753ccca09d6cbe1b128f
2019-08-14[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor ↵Xin Li
(5713463) in stage-aosp-master am: b0c3d33c82 -s ours am skip reason: subject contains skip directive Change-Id: I7c669633ce0eb0ebdf747d5471efe20f95d43ba7
2019-08-14DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: Ibdfe6905183861a6a7cda499e146425eda7e0f73
2019-07-29Merge "Remove most modules from compiler-rt." am: eb5d901119 am: 37de716ff7 ↵Pirama Arumuga Nainar
am: b0a51d5bdf am: d261a9cae6 am: b361e3170d Change-Id: Iaf86e491d598f256ea43ae6060a396a4e1c6e9fd
2019-07-29Merge "Remove most modules from compiler-rt." am: eb5d901119 am: 37de716ff7 ↵Pirama Arumuga Nainar
am: b0a51d5bdf am: d261a9cae6 Change-Id: I2eafc18d235fa78fcfeed8c71729d60fd91ab562
2019-07-29Merge "Remove most modules from compiler-rt." am: eb5d901119 am: 37de716ff7Pirama Arumuga Nainar
am: b0a51d5bdf Change-Id: I49825751f37b3af520d88b34f9c145dd78500826
2019-07-29Merge "Remove most modules from compiler-rt." am: eb5d901119Pirama Arumuga Nainar
am: 37de716ff7 Change-Id: I03b468335ef345bb7be5802accc859d6ca16fce1
2019-07-29Merge "Remove most modules from compiler-rt."Pirama Arumuga Nainar
am: eb5d901119 Change-Id: I9869fc2f8116e6ad564e703221cdecaa9edcdaeb
2019-07-29Merge "Remove most modules from compiler-rt."Pirama Arumuga Nainar
2019-07-25Remove most modules from compiler-rt.Dan Albert
The builtins are used for renderscript, but everything else here shouldn't be used since those libraries should come from the toolchain as prebuilts. Test: make checkbuild Bug: http://b/74067984 Change-Id: Icabe04995aba443634c179b95e6d11d12b532e51
2019-07-01[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: caa3a3ff21 -s ours am: b9ccf3fa6f am: 1855b812b1 -s ours am skip reason: subject contains skip directive Change-Id: I42a50e8498fdb925bb9765fd2d5cad0d0644632d
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 11:48:00 +0000