aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-21 03:07:23 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-21 03:07:23 +0000
commit9304573774d6f4cdd5b37bfb8573704ab1fbcef1 (patch)
treeb97d703b79aa2d0d0e3edf85e0e0948fbe8578df
parent00af5a06e68691286fa9aefc3b6b0b8f74628767 (diff)
parent126f2f919248d37220e16fc0bd077f2aee75c566 (diff)
downloadlibcore-9304573774d6f4cdd5b37bfb8573704ab1fbcef1.tar.gz
Snap for 7662878 from 126f2f919248d37220e16fc0bd077f2aee75c566 to sc-qpr1-release
Change-Id: Id32c7234e96bbabd0bebefd9450adf0a56eaea27
-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