Treehugger Robot
57ff9874da
[automerger skipped] Merge "Fix linker path for emulated architecture" into android10-tests-dev am: ce45ee1184 -s ours am: 00653f6ae3 -s ours am: ebc90ae254 -s ours am: e1c9dbc5ba -s ours am: e36df1a6c0 -s ours
...
am skip reason: skipped by user levarum
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1183110
Change-Id: I220ef3b87fb7d62254923388ec71a8ee94b4b822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 20:00:52 +00:00
Automerger Merge Worker
89eb482aee
Merge changes from topic "am-8820c465c51b44949f4e1a80b5097183" am: 9888c1aae5
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1164119
Change-Id: Ib8ce82f5e910c6b3187a8ca8c6dac75f1ab9b8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 20:00:30 +00:00
Treehugger Robot
a9223360d2
[automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit binary translations" into android10-tests-dev am: 3382f346fc -s ours am: 7fad99971d -s ours am: b013f1698e -s ours am: ed828cfb2e -s ours am: 18bb0fce55 -s ours
...
am skip reason: skipped by user rossyeh
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1164119
Change-Id: Id575e1c1382bc160a6dbc63bd789046947b54555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 20:00:29 +00:00
Automerger Merge Worker
2d7dd618e7
Merge "Merge "Merge "Merge "Merge "Stop executing if skip occurs." into android10-tests-dev am: 1e4793561f" into android11-tests-dev am: 3596058918" into android12-tests-dev am: d55f2ce1ef" into android12L-tests-dev am: 45cb321127" am: 4f625b29dd
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1126826
Change-Id: I325b4a692eed6f070a2e35078b47e1509e298a9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 20:00:10 +00:00
Automerger Merge Worker
baaf42c11b
Merge "Merge "Merge changes from topic "am-b2f669f2672c49a5b83a262bba261f9f" into android12-tests-dev am: d8a59345e1" into android12L-tests-dev am: 60d6cfe283" am: 92d7eeb156
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1466626
Change-Id: I28a9c9195a8dd4dc547c60a6356317a723f9c01a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:59:56 +00:00
Automerger Merge Worker
6c95c7ed3c
Merge changes from topic "am-091f415997b249b294c1df49d5087405" am: 303ab2c8b4
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1431308
Change-Id: I5e857c6b6171eddf251e39932e4ee84707d1572c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:59:33 +00:00
Treehugger Robot
b84fb0ca2a
[automerger skipped] Merge changes I42a81210,I42ce2b5a,Id949c9e5 into android11-tests-dev am: 0d97015dbe -s ours am: 6c706660e9 -s ours am: 9778932c7f -s ours am: 5ac1e26c51 -s ours
...
am skip reason: skipped by user levarum
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1431308
Change-Id: Ie9c74865db24b0e9511082dfcfca566cec10f3a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:59:32 +00:00
Automerger Merge Worker
83e70ab7f3
Merge "Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android11-tests-dev am: 9d0912a7b2" into android12-tests-dev am: f14019cf61" into android12L-tests-dev am: dc8f5f7d3a"
2022-04-27 19:51:26 +00:00
Automerger Merge Worker
7294f4a88c
Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android11-tests-dev am: 9d0912a7b2" into android12-tests-dev am: f14019cf61" into android12L-tests-dev am: dc8f5f7d3a
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078359
Change-Id: I594cefad36406ac8ff97528f11c7100b212637ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:51:23 +00:00
Automerger Merge Worker
dc8f5f7d3a
Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android11-tests-dev am: 9d0912a7b2" into android12-tests-dev am: f14019cf61" into android12L-tests-dev
2022-04-27 19:30:39 +00:00
Automerger Merge Worker
f4b7c1ecc2
Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android11-tests-dev am: 9d0912a7b2" into android12-tests-dev am: f14019cf61
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078359
Change-Id: I162c86e60a34a50eef6079bcab78172c69c76f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:30:37 +00:00
Automerger Merge Worker
112a717077
Merge "Merge "Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android10-tests-dev am: 16457fd9d0" into android11-tests-dev am: ede618aef2" into android12-tests-dev am: ba0f5b9195" into android12L-tests-dev am: 19dce61545"
2022-04-27 19:22:07 +00:00
Automerger Merge Worker
4f61022f30
Merge "Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android10-tests-dev am: 16457fd9d0" into android11-tests-dev am: ede618aef2" into android12-tests-dev am: ba0f5b9195" into android12L-tests-dev am: 19dce61545
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078358
Change-Id: I0f6ee716bba94d903dae26c11aa6163bcc07e322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:22:05 +00:00
Automerger Merge Worker
3e8dfcebfb
Merge "Merge "Merge "Regression test for scudo crash in resizeTaggedChunk." into android12-tests-dev am: d8fa0f64af" into android12L-tests-dev am: 6c73a7ac6f"
2022-04-27 19:21:53 +00:00
Automerger Merge Worker
f93ff759bf
Merge "Merge "Regression test for scudo crash in resizeTaggedChunk." into android12-tests-dev am: d8fa0f64af" into android12L-tests-dev am: 6c73a7ac6f
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1901121
Change-Id: I55008be651749df05318012445d36b228c517af0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:21:51 +00:00
Automerger Merge Worker
cf1733aceb
Merge "Merge "Merge "Skip the malloc_slack test on native bridge." into android12-tests-dev am: 1623704319" into android12L-tests-dev am: 9ca3b55cc1"
2022-04-27 19:21:44 +00:00
Automerger Merge Worker
1a55dd91ee
Merge "Merge "Skip the malloc_slack test on native bridge." into android12-tests-dev am: 1623704319" into android12L-tests-dev am: 9ca3b55cc1
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1854022
Change-Id: Ic97a53d86d458f56249e5e3d9b90cf1abeed74a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:21:42 +00:00
Automerger Merge Worker
a7e8b92de6
Merge "Merge "Merge "Merge "Merge "Fix possible issue with cfi_basic test." into android10-tests-dev am: 3144bf7b69" into android11-tests-dev am: 9ef57feced" into android12-tests-dev am: 05f451ff40" into android12L-tests-dev am: 68fd586b3a"
2022-04-27 19:21:35 +00:00
Automerger Merge Worker
89839f9169
Merge "Merge "Merge "Merge "Fix possible issue with cfi_basic test." into android10-tests-dev am: 3144bf7b69" into android11-tests-dev am: 9ef57feced" into android12-tests-dev am: 05f451ff40" into android12L-tests-dev am: 68fd586b3a
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1450415
Change-Id: Ic655861445d6bfb675db4c53996f46ed901fac65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:21:34 +00:00
Automerger Merge Worker
99eb475597
Merge changes from topic "am-492299fff56f41ea80d26768bcc5c005"
...
* changes:
Merge changes from topic "am-1f04af5ac4724e08a16e070a0669bd45" into android12L-tests-dev am: f84b535bf1c9608ab2e283dd5914aef1f4c02d31ef543c40bc
2022-04-27 19:21:22 +00:00
Automerger Merge Worker
c8d78f5840
Merge changes from topic "am-1f04af5ac4724e08a16e070a0669bd45" into android12L-tests-dev am: f84b535bf1
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143
Change-Id: Id2cae79161d56e746802540fa1d73b90cba3de1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:21:19 +00:00
Treehugger Robot
8560b4b39f
[automerger skipped] Merge "Remove stack address check in cfi_basic test." into android10-tests-dev am: c9608ab2e2 -s ours am: 83dd5914ae -s ours am: f1f4c02d31 -s ours am: ef543c40bc -s ours
...
am skip reason: skipped by user eugenis
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143
Change-Id: I1eb3213dbf6f5e1581f13cc2257c97a952247ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:21:18 +00:00
Automerger Merge Worker
3286b39941
Merge changes from topic "am-c6b8230339e24a95948ea129db34cb0d"
...
* changes:
Merge changes from topic "am-3cb4ee1e5c574467a4389675df3d49f9" into android12L-tests-dev am: 5b935518c3ce45ee118400653f6ae3ebc90ae254e1c9dbc5ba
2022-04-27 19:21:02 +00:00
Automerger Merge Worker
acf63dd04b
Merge changes from topic "am-3cb4ee1e5c574467a4389675df3d49f9" into android12L-tests-dev am: 5b935518c3
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1183110
Change-Id: I33b3747e7b6b80ddc842d9290dedfdcc7a188a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:20:59 +00:00
Treehugger Robot
e36df1a6c0
[automerger skipped] Merge "Fix linker path for emulated architecture" into android10-tests-dev am: ce45ee1184 -s ours am: 00653f6ae3 -s ours am: ebc90ae254 -s ours am: e1c9dbc5ba -s ours
...
am skip reason: skipped by user levarum
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1183110
Change-Id: Ib30b4c4fd82e0bddb7d3593b4186d138c043a6c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:20:58 +00:00
Automerger Merge Worker
9888c1aae5
Merge changes from topic "am-8820c465c51b44949f4e1a80b5097183"
...
* changes:
Merge changes from topic "am-bc40fdbdb974448fae6cea79ea66b3bd" into android12L-tests-dev am: eec41910103382f346fc7fad99971db013f1698eed828cfb2e
2022-04-27 19:20:42 +00:00
Automerger Merge Worker
e5cb9e312f
Merge changes from topic "am-bc40fdbdb974448fae6cea79ea66b3bd" into android12L-tests-dev am: eec4191010
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1164119
Change-Id: I1b5be9950586cad96957de88fbecae469184bd70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:20:39 +00:00
Treehugger Robot
18bb0fce55
[automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit binary translations" into android10-tests-dev am: 3382f346fc -s ours am: 7fad99971d -s ours am: b013f1698e -s ours am: ed828cfb2e -s ours
...
am skip reason: skipped by user rossyeh
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1164119
Change-Id: I09c01dc8314caf9cc56d23e5f5f2756fab2945d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:20:38 +00:00
Automerger Merge Worker
4f625b29dd
Merge "Merge "Merge "Merge "Merge "Stop executing if skip occurs." into android10-tests-dev am: 1e4793561f" into android11-tests-dev am: 3596058918" into android12-tests-dev am: d55f2ce1ef" into android12L-tests-dev am: 45cb321127"
2022-04-27 19:20:20 +00:00
Automerger Merge Worker
0673f4161a
Merge "Merge "Merge "Merge "Stop executing if skip occurs." into android10-tests-dev am: 1e4793561f" into android11-tests-dev am: 3596058918" into android12-tests-dev am: d55f2ce1ef" into android12L-tests-dev am: 45cb321127
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1126826
Change-Id: Ie4640cc893719dcccafb1612bf6efd7f3cabf7f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:20:18 +00:00
Automerger Merge Worker
92d7eeb156
Merge "Merge "Merge changes from topic "am-b2f669f2672c49a5b83a262bba261f9f" into android12-tests-dev am: d8a59345e1" into android12L-tests-dev am: 60d6cfe283"
2022-04-27 19:20:06 +00:00
Automerger Merge Worker
1ac81dc146
Merge "Merge changes from topic "am-b2f669f2672c49a5b83a262bba261f9f" into android12-tests-dev am: d8a59345e1" into android12L-tests-dev am: 60d6cfe283
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1466626
Change-Id: I766fea6c5566d9cc35ed744c06e55f482de3e9f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:20:04 +00:00
Automerger Merge Worker
303ab2c8b4
Merge changes from topic "am-091f415997b249b294c1df49d5087405"
...
* changes:
Merge changes from topic "am-eea3e96d84c34ba68e8c9263fc0b0332" into android12L-tests-dev am: 9f1eb8a9430d97015dbe6c706660e99778932c7f
2022-04-27 19:19:54 +00:00
Automerger Merge Worker
034ce6e783
Merge changes from topic "am-eea3e96d84c34ba68e8c9263fc0b0332" into android12L-tests-dev am: 9f1eb8a943
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1431308
Change-Id: I991356aa821b36600a86b30f5a2ab613001e2844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:19:49 +00:00
Treehugger Robot
5ac1e26c51
[automerger skipped] Merge changes I42a81210,I42ce2b5a,Id949c9e5 into android11-tests-dev am: 0d97015dbe -s ours am: 6c706660e9 -s ours am: 9778932c7f -s ours
...
am skip reason: skipped by user levarum
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1431308
Change-Id: I32a6fa2f5f0b1a905910ebaa191c4b019690b1e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:19:48 +00:00
Automerger Merge Worker
f14019cf61
Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android11-tests-dev am: 9d0912a7b2" into android12-tests-dev
2022-04-27 19:10:53 +00:00
Treehugger Robot
9a08a468f4
Merge "Fix unistd.exec_argv0_null for new kernels." into android11-tests-dev am: 9d0912a7b2
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078359
Change-Id: I0888d94e6b6f19b25bfb5b5482ba18e539ceed60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:10:51 +00:00
Automerger Merge Worker
19dce61545
Merge "Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android10-tests-dev am: 16457fd9d0" into android11-tests-dev am: ede618aef2" into android12-tests-dev am: ba0f5b9195" into android12L-tests-dev
2022-04-27 19:01:17 +00:00
Automerger Merge Worker
1fee8b5a67
Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android10-tests-dev am: 16457fd9d0" into android11-tests-dev am: ede618aef2" into android12-tests-dev am: ba0f5b9195
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078358
Change-Id: Ia3d387780844a30feaaa65c55841f0577561620d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:01:15 +00:00
Automerger Merge Worker
6c73a7ac6f
Merge "Merge "Regression test for scudo crash in resizeTaggedChunk." into android12-tests-dev am: d8fa0f64af" into android12L-tests-dev
2022-04-27 19:01:09 +00:00
Treehugger Robot
377ae72607
Merge "Regression test for scudo crash in resizeTaggedChunk." into android12-tests-dev am: d8fa0f64af
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1901121
Change-Id: I49830085e20d8aa627b9322672aaaa4770ac5515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:01:06 +00:00
Automerger Merge Worker
9ca3b55cc1
Merge "Merge "Skip the malloc_slack test on native bridge." into android12-tests-dev am: 1623704319" into android12L-tests-dev
2022-04-27 19:01:01 +00:00
Treehugger Robot
5e5acad528
Merge "Skip the malloc_slack test on native bridge." into android12-tests-dev am: 1623704319
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1854022
Change-Id: Id50dd0d3a8060ad7943a9f08401e88b05c75be4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:00:59 +00:00
Automerger Merge Worker
68fd586b3a
Merge "Merge "Merge "Merge "Fix possible issue with cfi_basic test." into android10-tests-dev am: 3144bf7b69" into android11-tests-dev am: 9ef57feced" into android12-tests-dev am: 05f451ff40" into android12L-tests-dev
2022-04-27 19:00:54 +00:00
Automerger Merge Worker
73d890772e
Merge "Merge "Merge "Fix possible issue with cfi_basic test." into android10-tests-dev am: 3144bf7b69" into android11-tests-dev am: 9ef57feced" into android12-tests-dev am: 05f451ff40
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1450415
Change-Id: I8bbdff9b63ebf8e0ee708c6c56fdf020c9f96c13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:00:53 +00:00
Automerger Merge Worker
f84b535bf1
Merge changes from topic "am-1f04af5ac4724e08a16e070a0669bd45" into android12L-tests-dev
...
* changes:
Merge changes from topic "am-921d9d6a4c2c43f5a9b3423f6a35dc3f" into android12-tests-dev am: 0f42ca9a3dc9608ab2e283dd5914aef1f4c02d31
2022-04-27 19:00:46 +00:00
Treehugger Robot
ef543c40bc
[automerger skipped] Merge "Remove stack address check in cfi_basic test." into android10-tests-dev am: c9608ab2e2 -s ours am: 83dd5914ae -s ours am: f1f4c02d31 -s ours
...
am skip reason: skipped by user eugenis
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143
Change-Id: I936a873352937664f09b12a6f00c46de893fccf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:00:43 +00:00
Automerger Merge Worker
a416c1197b
Merge changes from topic "am-921d9d6a4c2c43f5a9b3423f6a35dc3f" into android12-tests-dev am: 0f42ca9a3d
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143
Change-Id: I962fc4b81e6ad9036be2aed88e6bc5cc58e69cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:00:43 +00:00
Automerger Merge Worker
5b935518c3
Merge changes from topic "am-3cb4ee1e5c574467a4389675df3d49f9" into android12L-tests-dev
...
* changes:
Merge changes from topic "am-661a49b408184197ab5bda5c099811e2" into android12-tests-dev am: 80effeeac9ce45ee118400653f6ae3ebc90ae254
2022-04-27 19:00:24 +00:00
Automerger Merge Worker
c1575522e8
Merge changes from topic "am-661a49b408184197ab5bda5c099811e2" into android12-tests-dev am: 80effeeac9
...
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1183110
Change-Id: Iff415cc90425d8727609998829f782fbc143a0bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 19:00:21 +00:00
