diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-03 01:50:15 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-03 01:50:15 +0000 |
| commit | 88ee68c2389287106103672e795acb7af91a610a (patch) | |
| tree | b97d703b79aa2d0d0e3edf85e0e0948fbe8578df | |
| parent | 4235a5d6d90069e72e47e0fec9dbaf281d82696e (diff) | |
| parent | 9256b2dfd8b1bfe8a9ab6f12039d2387ac6fd916 (diff) | |
| download | libcore-android12-d1-s5-release.tar.gz | |
Merge cherrypicks of [15750529, 15750548, 15750351, 15750587, 15750549, 15750550, 15750473, 15750474, 15750475, 15741570, 15741571, 15741572, 15741573, 15741574, 15741575] into sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-release
Change-Id: I40188816d37a06fe184a322e7f920260ae4adb1d
| -rw-r--r-- | ojluni/src/main/native/UNIXProcess_md.c | 3 |
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 |