aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-09-02 19:06:52 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-09-02 19:06:52 +0000
commit21a29e971fb9963318f7962ad25e6412fa74ce2c (patch)
treeb97d703b79aa2d0d0e3edf85e0e0948fbe8578df
parentef6566d6c85b4fbd18740a9420604029ff91fadf (diff)
parent0ad75a98bb116062e7dbca4b4a885343bf0748c6 (diff)
downloadlibcore-android-mainline-12.0.0_r48.tar.gz
Snap for 7698491 from 0ad75a98bb116062e7dbca4b4a885343bf0748c6 to mainline-mediaprovider-releaseandroid-mainline-12.0.0_r48android-mainline-12.0.0_r31android-mainline-12.0.0_r11
Change-Id: Ie7ce9a8022e392dbe063fef53639406a2dce30de
-rw-r--r--ojluni/src/main/native/UNIXProcess_md.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ojluni/src/main/native/UNIXProcess_md.c b/ojluni/src/main/native/UNIXProcess_md.c
index 40fdc18fb8a..a3790e8c5f1 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