Commit graph

40744 commits

Author SHA1 Message Date
Elliott Hughes
0d30cf6fe2 Merge "Update <sys/cachectl.h>." into main am: 9634513a63 am: b7f7f55e1e am: 389fbc14a9 am: 40663afff0 am: f986f09cb9
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2661559

Change-Id: Ie57c8953c30499476ac0c34f0e739df1aa87733f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:05:24 +00:00
Dan Albert
71cee896cd Merge "Fix 5-byte mbrtoc16 test for glibc/musl." into main am: d0b8d3c901 am: 38ef6b78c2 am: b8e9947119 am: 1d9a47178c am: 424e68d468
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2658959

Change-Id: I0215631088038a5f4f2553d7161c9919d2117717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:02:12 +00:00
Elliott Hughes
f986f09cb9 Merge "Update <sys/cachectl.h>." into main am: 9634513a63 am: b7f7f55e1e am: 389fbc14a9 am: 40663afff0
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2661559

Change-Id: I180229ed27b8de2e72a044fafbb77afba2f462ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 01:18:17 +00:00
Dan Albert
424e68d468 Merge "Fix 5-byte mbrtoc16 test for glibc/musl." into main am: d0b8d3c901 am: 38ef6b78c2 am: b8e9947119 am: 1d9a47178c
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2658959

Change-Id: Id0abbf7318426baf016e6c3495d8b575160a0f4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 01:17:12 +00:00
Elliott Hughes
40663afff0 Merge "Update <sys/cachectl.h>." into main am: 9634513a63 am: b7f7f55e1e am: 389fbc14a9
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2661559

Change-Id: Icd051d7a7f22a1561a9c519c30e2fa3a797c852a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 00:32:20 +00:00
Dan Albert
1d9a47178c Merge "Fix 5-byte mbrtoc16 test for glibc/musl." into main am: d0b8d3c901 am: 38ef6b78c2 am: b8e9947119
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2658959

Change-Id: I00fccba333323f70a8cd6e9f2d263c0706b0d724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 00:31:31 +00:00
Treehugger Robot
f7789c169f Merge "Make getentropy available from <unistd.h>" into main am: 7ca162602b am: 84b1673b7d am: 5f08946acf am: f5cb7c1701 am: 2baab919e6
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2659335

Change-Id: I83b0002fa9a546be27a835ee3a71e0eeef6fbb42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 00:07:27 +00:00
Elliott Hughes
389fbc14a9 Merge "Update <sys/cachectl.h>." into main am: 9634513a63 am: b7f7f55e1e
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2661559

Change-Id: I412afb428f0d492ae7dce65e380f124bc5f6484c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 23:46:00 +00:00
Dan Albert
b8e9947119 Merge "Fix 5-byte mbrtoc16 test for glibc/musl." into main am: d0b8d3c901 am: 38ef6b78c2
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2658959

Change-Id: I4e08365ca3f851ce6c75cb4a6b323f1a085d2a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 23:44:43 +00:00
Treehugger Robot
2baab919e6 Merge "Make getentropy available from <unistd.h>" into main am: 7ca162602b am: 84b1673b7d am: 5f08946acf am: f5cb7c1701
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2659335

Change-Id: I767aaa42cb0784baf5b83edf6223a2edc0aee969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 23:22:16 +00:00
Elliott Hughes
b7f7f55e1e Merge "Update <sys/cachectl.h>." into main am: 9634513a63
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2661559

Change-Id: If17fca5bd0cf1acc52737a2f4a4c5aedc31bc9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 23:03:44 +00:00
Dan Albert
38ef6b78c2 Merge "Fix 5-byte mbrtoc16 test for glibc/musl." into main am: d0b8d3c901
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2658959

Change-Id: I141f25721bf17fe7ae9c3b3561739b81187fa721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 23:02:34 +00:00
Treehugger Robot
f5cb7c1701 Merge "Make getentropy available from <unistd.h>" into main am: 7ca162602b am: 84b1673b7d am: 5f08946acf
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2659335

Change-Id: I2747e7905c3568359210af7d93205fda4c9c2596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 22:37:18 +00:00
Elliott Hughes
9634513a63 Merge "Update <sys/cachectl.h>." into main 2023-07-18 22:36:53 +00:00
Dan Albert
d0b8d3c901 Merge "Fix 5-byte mbrtoc16 test for glibc/musl." into main 2023-07-18 22:25:11 +00:00
Treehugger Robot
5f08946acf Merge "Make getentropy available from <unistd.h>" into main am: 7ca162602b am: 84b1673b7d
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2659335

Change-Id: I904576a7060373a04da2a02779d61e498fe4b8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 21:49:36 +00:00
Treehugger Robot
84b1673b7d Merge "Make getentropy available from <unistd.h>" into main am: 7ca162602b
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2659335

Change-Id: Idcca71979008d51ae158fb3352bcb1d0703076a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 21:05:32 +00:00
Treehugger Robot
7ca162602b Merge "Make getentropy available from <unistd.h>" into main 2023-07-18 20:10:06 +00:00
Elliott Hughes
8d350da500 Update <sys/cachectl.h>.
NDK API review complained about missing nullability annotations (added),
not having a `__riscv` #if guard around this function (added), and not
using `__INTRODUCED_IN(35)`. I haven't done the last of these because
that seems less helpful than the traditional "nothing" meaning "always
available" (since this riscv64-only function will be available from
whatever the first riscv64 API level ends up being).

Bug: http://b/291777120
Test: treehugger
Change-Id: I501b42851bd5b1612244bd86351628d249a57b99
2023-07-18 18:58:02 +00:00
Dan Albert
1252ab04c3 Fix 5-byte mbrtoc16 test for glibc/musl.
Also split that case out into a separate test to avoid complicating
the test for the common cases.

Bug: None
Test: ./tests/run-on-host.sh glibc --gtest_filter="uchar.mbrtoc16"
Change-Id: If7e50f659ad99ee9bab8847fc7320c7bbd629c5d
2023-07-17 23:52:02 +00:00
Paul Lawrence
b1c1cf7c86 Revert "Use proprety_socket_for_system if permissions allow" am: 78973da8ef am: 30537bd10a am: c88d51c04b am: fc075d4979
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028889

Change-Id: Iabc52671facef996c587eb16405444d6aa8959ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:51:06 +00:00
Paul Lawrence
d14146aa30 Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: af594059f4 am: 6a53c1a805 am: 052fa2130c
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888

Change-Id: I1040e44d9340a4c784965a9f001aaa9b125d84ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:51:04 +00:00
David Benjamin
7110157e94 Make getentropy available from <unistd.h>
getentropy is originally an OpenBSD-ism, where it was in <unistd.h> from
day one:
https://man.openbsd.org/OpenBSD-5.6/getentropy

FreeBSD's and Linux's current man pages also document it this way:
https://man7.org/linux/man-pages/man3/getentropy.3.html
https://man.freebsd.org/cgi/man.cgi?query=getentropy&sektion=3&format=html

The man7.org URL is even cited by bionic itself in the comments, though
glibc originally put it in <sys/random.h> and added to <unistd.h> very
shortly afterwards:
https://sourceware.org/bugzilla/show_bug.cgi?id=17252#c9

The cited man page (maintained separately from glibc) originally
documented <sys/random.h>...
https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/man3/getentropy.3?id=b0265728162cdcafb8e7d7f1372e8de1a4c963ed

But similarly fixed it to <unistd.h> three months later:
https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/man3/getentropy.3?id=9cf011f94b56e8832c5a5d8cf66d4a115d34b9cc

musl matches the BSDs in putting it in <unistd.h>, but not
<sys/random.h>.
https://git.musl-libc.org/cgit/musl/tree/include/unistd.h?id=25e6fee27f4a293728dd15b659170e7b9c7db9bc#n183

POSIX will likely place it there too:
https://www.austingroupbugs.net/view.php?id=1134

macOS and Fuchsia place it in <sys/random.h> and not <unistd.h>, though
given the rest of this precedent, they're clearly outliers. (Note iOS
does *not* have getentropy, just macOS. The system has it, but it's not
exposed as public API. See https://dev.gnupg.org/T5375 and
https://github.com/openssl/openssl/pull/15924.)

Use the more standard location in bionic and put getentropy in
<unistd.h>. This will improve portability and avoid needing workarounds
in BoringSSL. For compatibility, keep it also available in
<sys/random.h> by using a <bits/getentropy.h> header.

BYPASS_INCLUSIVE_LANGUAGE_REASON=Above URLs are not hosted by Android and reference the name of a command-line utility, short for 'manual', as in instruction manual

Bug: 290898063
Test: treehugger
Change-Id: Id2d6b6ea09d814e5ba2cb117a7af2c74861148fb
2023-07-17 21:50:53 +00:00
Paul Lawrence
932ea7283d Revert "Use proprety_socket_for_system if permissions allow" am: 78973da8ef am: 1d795fe6f7 am: 131a1cc49d am: dfbbf63af0
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028889

Change-Id: Idf9dd94edbc5081e7a4f54546173328825efc3f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:50:44 +00:00
Paul Lawrence
d3b3930cd2 Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: 5164539e78 am: 35d9c8c57d am: 0bf061b868
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888

Change-Id: I5ed09450813a255cb895bbce58515c53feb6268c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:50:42 +00:00
Paul Lawrence
3ab5eae2bc Revert "Use proprety_socket_for_system if permissions allow" am: 78973da8ef am: 30537bd10a am: 7f068bb754 am: 2039a292b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028889

Change-Id: Ifae9dc9fac990038e8bc1a76c15e8ffa86367e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:50:24 +00:00
Paul Lawrence
87e6f0b3af Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: af594059f4 am: 7e37dd36db am: 4d0ffbfec9
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888

Change-Id: Ia4d926a86f7c29a66c512350e2feee0322f52915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:50:20 +00:00
Paul Lawrence
fc075d4979 Revert "Use proprety_socket_for_system if permissions allow" am: 78973da8ef am: 30537bd10a am: c88d51c04b
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028889

Change-Id: If63fabcff1e67a88321b02296e5760c46478ca0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 18:22:33 +00:00
Paul Lawrence
052fa2130c Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: af594059f4 am: 6a53c1a805
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888

Change-Id: I02f6c2d4bd2975fbceb35aa745047cabfc60e758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 18:22:30 +00:00
Paul Lawrence
dfbbf63af0 Revert "Use proprety_socket_for_system if permissions allow" am: 78973da8ef am: 1d795fe6f7 am: 131a1cc49d
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028889

Change-Id: Ied4986a1516aa34c053496533c668fc6cd1d45dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 17:54:49 +00:00
Paul Lawrence
0bf061b868 Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: 5164539e78 am: 35d9c8c57d
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888

Change-Id: Ia8337efbae59478b3c4612276441f1bb22e03526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 17:54:46 +00:00
Paul Lawrence
2039a292b4 Revert "Use proprety_socket_for_system if permissions allow" am: 78973da8ef am: 30537bd10a am: 7f068bb754
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028889

Change-Id: Ifdb36c1d7370735c46095d009e23308c86b4ccaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 17:54:18 +00:00
Paul Lawrence
4d0ffbfec9 Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: af594059f4 am: 7e37dd36db
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888

Change-Id: I5c4c39a7e18b13c58bf4bdbabad93b20db2bc166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 17:54:15 +00:00
Paul Lawrence
05328b4160 Revert "Use proprety_socket_for_system if permissions allow" am: 78973da8ef am: 5210d35c91
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028889

Change-Id: I26225b9eb5a8e6875577eddb18f3bf9e83456f90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 17:37:46 +00:00
Paul Lawrence
425d8361ca Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: 981e477fa8
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888

Change-Id: I86a696f956e6fea4787924ce731287bfbc4dfc27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 17:37:43 +00:00
Paul Lawrence
131a1cc49d Revert "Use proprety_socket_for_system if permissions allow" am: 78973da8ef am: 1d795fe6f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028889

Change-Id: Ibbc9c12cc4a72b660393d5b756e4d0695e8f903c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 17:36:38 +00:00
Paul Lawrence
35d9c8c57d Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: 5164539e78
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888

Change-Id: Id6d4da7b2d253dd9875894b3825284114a11b737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 17:36:33 +00:00
Paul Lawrence
c88d51c04b Revert "Use proprety_socket_for_system if permissions allow" am: 78973da8ef am: 30537bd10a
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028889

Change-Id: If35cf7fa9349ece47496b8ed12430a115b63debd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 17:36:06 +00:00
Paul Lawrence
6a53c1a805 Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: af594059f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888

Change-Id: I34cea5ef684642bbf904cac4bf32403afaae2d19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 17:36:04 +00:00
Paul Lawrence
7f068bb754 Revert "Use proprety_socket_for_system if permissions allow" am: 78973da8ef am: 30537bd10a
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028889

Change-Id: Ie7d4ff74ebd72e5388016f4e897a7b88152302d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 17:31:48 +00:00
Paul Lawrence
7e37dd36db Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: af594059f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888

Change-Id: I843c4303f60b752ab6249811c3652c8e6df1547a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 17:31:43 +00:00
Paul Lawrence
5210d35c91 Revert "Use proprety_socket_for_system if permissions allow" am: 78973da8ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028889

Change-Id: I53c2b348d49829f228296979d5f09d691065367c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 16:52:16 +00:00
Paul Lawrence
981e477fa8 Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888

Change-Id: Ic3b63c51925669320684eed1a262955e121c23ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 16:52:13 +00:00
Paul Lawrence
30537bd10a Revert "Use proprety_socket_for_system if permissions allow" am: 78973da8ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028889

Change-Id: I22c2938e37cde28b57676e7234d4bd1cc4b49865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 16:52:01 +00:00
Paul Lawrence
af594059f4 Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888

Change-Id: I7dd0f039c1a08dca7904581762f30d9c026507ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 16:51:58 +00:00
Paul Lawrence
1d795fe6f7 Revert "Use proprety_socket_for_system if permissions allow" am: 78973da8ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028889

Change-Id: I4bd998f8a7ee33c0d6d7bc55b75866bc853e5ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 16:47:24 +00:00
Paul Lawrence
5164539e78 Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888

Change-Id: I388be374f40887b2a7b620407f738315f7e330ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 16:47:22 +00:00
Elliott Hughes
7d87ca8d22 Merge "Add riscv_hwprobe to the seccomp allowlist." into main am: a2cdb247e1 am: e6cc982146 am: 3ace80b9b1 am: 71b7ceb20f am: b3c40e2f72
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2657071

Change-Id: I27519f6b01877d4f7cc62aac9ec8507a688a1f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 00:03:36 +00:00
Elliott Hughes
b3c40e2f72 Merge "Add riscv_hwprobe to the seccomp allowlist." into main am: a2cdb247e1 am: e6cc982146 am: 3ace80b9b1 am: 71b7ceb20f
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2657071

Change-Id: I3ea4635c02a730a644cf7fa975d2cfa923260c39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 22:39:27 +00:00
Elliott Hughes
71b7ceb20f Merge "Add riscv_hwprobe to the seccomp allowlist." into main am: a2cdb247e1 am: e6cc982146 am: 3ace80b9b1
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2657071

Change-Id: Iab40b5a1e241e150b655b3534c6d095e7739e158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 21:53:22 +00:00