commit 88ee68c2389287106103672e795acb7af91a610a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Sep 03 01:50:15 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Sep 03 01:50:15 2021 +0000
tree b97d703b79aa2d0d0e3edf85e0e0948fbe8578df
parent 4235a5d6d90069e72e47e0fec9dbaf281d82696e
parent 9256b2dfd8b1bfe8a9ab6f12039d2387ac6fd916

Merge cherrypicks of [15750529, 15750548, 15750351, 15750587, 15750549, 15750550, 15750473, 15750474, 15750475, 15741570, 15741571, 15741572, 15741573, 15741574, 15741575] into sc-d1-release

Change-Id: I40188816d37a06fe184a322e7f920260ae4adb1d

ojluni/src/main/native/UNIXProcess_md.c

diff --git a/ojluni/src/main/native/UNIXProcess_md.c b/ojluni/src/main/native/UNIXProcess_md.c
index 40fdc18..a3790e8 100644
--- a/ojluni/src/main/native/UNIXProcess_md.c
+++ b/ojluni/src/main/native/UNIXProcess_md.c
@@ -119,8 +119,7 @@
 #ifndef START_CHILD_USE_VFORK
 // Android-changed: disable vfork under AddressSanitizer.
 //  #ifdef __linux__
-  #if defined(__linux__) && !__has_feature(address_sanitizer) && \
-      !__has_feature(hwaddress_sanitizer)
+  #if defined(__linux__) && !__has_feature(address_sanitizer)
     #define START_CHILD_USE_VFORK 1
   #else
     #define START_CHILD_USE_VFORK 0